drbd: Introduce __s32_field in the genetlink macro magic

...and drop explicit typecasts (int)meta_dev_idx < 0.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>

2 files changed, 4 insertions, 1 deletions

diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 549800668cb9..f143e3c0f33b 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -102,7 +102,7 @@ GENL_struct(DRBD_NLA_CFG_CONTEXT, 2, drbd_cfg_context,
 GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
         __str_field(1, GENLA_F_REQUIRED | GENLA_F_INVARIANT,    backing_dev,    128)
         __str_field(2, GENLA_F_REQUIRED | GENLA_F_INVARIANT,    meta_dev,       128)
-        __u32_field(3, GENLA_F_REQUIRED | GENLA_F_INVARIANT,    meta_dev_idx)
+        __s32_field(3, GENLA_F_REQUIRED | GENLA_F_INVARIANT,    meta_dev_idx)
 
         /* use the resize command to try and change the disk_size */
         __u64_field(4, GENLA_F_MANDATORY | GENLA_F_INVARIANT,   disk_size)
diff --git a/include/linux/genl_magic_struct.h b/include/linux/genl_magic_struct.h
index f2c7cc7831df..ddbdd0a24476 100644
--- a/include/linux/genl_magic_struct.h
+++ b/include/linux/genl_magic_struct.h
@@ -97,6 +97,9 @@ enum {
 #define __u32_field(attr_nr, attr_flag, name)   \
         __field(attr_nr, attr_flag, name, NLA_U32, __u32, \
                         nla_get_u32, NLA_PUT_U32)
+#define __s32_field(attr_nr, attr_flag, name)   \
+        __field(attr_nr, attr_flag, name, NLA_U32, __s32, \
+                        nla_get_u32, NLA_PUT_U32)
 #define __u64_field(attr_nr, attr_flag, name)   \
         __field(attr_nr, attr_flag, name, NLA_U64, __u64, \
                         nla_get_u64, NLA_PUT_U64)