drbd: Fix the upper limit of resync-after

The 32-bit resync_after netlink field takes a device minor number as
parameter, which is no longer limited to 255.  We cannot statically
verify which device numbers are valid, so set the ummer limit to the
highest possible signed 32-bit integer.

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

3 files changed, 7 insertions, 6 deletions

diff --git a/include/linux/drbd.h b/include/linux/drbd.h
index 6c7c85d8fc41..05063e6db81f 100644
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
@@ -130,8 +130,8 @@ enum drbd_ret_code {
         ERR_INTR                = 129, /* EINTR */
         ERR_RESIZE_RESYNC       = 130,
         ERR_NO_PRIMARY          = 131,
-        ERR_SYNC_AFTER          = 132,
-        ERR_SYNC_AFTER_CYCLE    = 133,
+        ERR_RESYNC_AFTER        = 132,
+        ERR_RESYNC_AFTER_CYCLE  = 133,
         ERR_PAUSE_IS_SET        = 134,
         ERR_PAUSE_IS_CLEAR      = 135,
         ERR_PACKET_NR           = 137,
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 67c816c0fc28..a59466f7f661 100644
--- 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_AFTER_DEF)
+        __u32_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/drbd_limits.h b/include/linux/drbd_limits.h
index 48339ae69d50..c4a8f0fef7b2 100644
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
@@ -113,9 +113,10 @@
 #define DRBD_AL_EXTENTS_MAX  6433
 #define DRBD_AL_EXTENTS_DEF  127
 
-#define DRBD_AFTER_MIN  -1
-#define DRBD_AFTER_MAX  255
-#define DRBD_AFTER_DEF  -1
+#define DRBD_RESYNC_AFTER_MIN  -1
+#define DRBD_RESYNC_AFTER_MAX  (1<<30)
+#define DRBD_RESYNC_AFTER_DEF  -1
+#define DRBD_RESYNC_AFTER_SCALE '1'
 
 /* } */