drbd: Convert resync-after into a signed netlink field

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

diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index a59466f7f661b3a9f98ccb718f04b55736c6b933..7b174a093a8de0fd4fd5d5c5d2c011cc350e28df 100644 (file)
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -114,7 +114,7 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
        __u32_field_def(7, GENLA_F_MANDATORY,   fencing, DRBD_FENCING_DEF)
 
        __u32_field_def(8,      GENLA_F_MANDATORY,      resync_rate, DRBD_RESYNC_RATE_DEF)
-       __u32_field_def(9,      GENLA_F_MANDATORY,      resync_after, DRBD_RESYNC_AFTER_DEF)
+       __s32_field_def(9,      GENLA_F_MANDATORY,      resync_after, DRBD_RESYNC_AFTER_DEF)
        __u32_field_def(10,     GENLA_F_MANDATORY,      al_extents, DRBD_AL_EXTENTS_DEF)
        __u32_field_def(11,     GENLA_F_MANDATORY,      c_plan_ahead, DRBD_C_PLAN_AHEAD_DEF)
        __u32_field_def(12,     GENLA_F_MANDATORY,      c_delay_target, DRBD_C_DELAY_TARGET_DEF)

diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
index e908f1c50355566bc779f809bb153fd01d9d34e7..94e839aafae38d5cbba6cc0ca016b083929102db 100644 (file)
--- a/include/linux/genl_magic_func.h
+++ b/include/linux/genl_magic_func.h
@@ -437,6 +437,9 @@ static inline int s_name ## _to_unpriv_skb(struct sk_buff *skb,             \
 #undef __u32_field_def
 #define __u32_field_def(attr_nr, attr_flag, name, default)             \
        x->name = default;
+#undef __s32_field_def
+#define __s32_field_def(attr_nr, attr_flag, name, default)             \
+       x->name = default;
 #undef __flg_field_def
 #define __flg_field_def(attr_nr, attr_flag, name, default)             \
        x->name = default;

diff --git a/include/linux/genl_magic_struct.h b/include/linux/genl_magic_struct.h
index b1ddbb5bd7256f83945cb06d9afea81816726273..0fca21fd1af50462707de2c973849508280c85cf 100644 (file)
--- a/include/linux/genl_magic_struct.h
+++ b/include/linux/genl_magic_struct.h
@@ -115,6 +115,8 @@ enum {
        __flg_field(attr_nr, attr_flag, name)
 #define __u32_field_def(attr_nr, attr_flag, name, default) \
        __u32_field(attr_nr, attr_flag, name)
+#define __s32_field_def(attr_nr, attr_flag, name, default) \
+       __s32_field(attr_nr, attr_flag, name)
 #define __str_field_def(attr_nr, attr_flag, name, maxlen) \
        __str_field(attr_nr, attr_flag, name, maxlen)