drbd: Refer to resync-rate consistently throughout the code

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

diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index fa36757ffc4a77730b6f42d69d074773b37a3d65..8026adacd3d26156ba71bb3ba103798d1788c8e8 100644 (file)
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -389,21 +389,21 @@ struct p_barrier_ack {
 } __packed;
 
 struct p_rs_param {
-       u32 rate;
+       u32 resync_rate;
 
              /* Since protocol version 88 and higher. */
        char verify_alg[0];
 } __packed;
 
 struct p_rs_param_89 {
-       u32 rate;
+       u32 resync_rate;
         /* protocol version 89: */
        char verify_alg[SHARED_SECRET_MAX];
        char csums_alg[SHARED_SECRET_MAX];
 } __packed;
 
 struct p_rs_param_95 {
-       u32 rate;
+       u32 resync_rate;
        char verify_alg[SHARED_SECRET_MAX];
        char csums_alg[SHARED_SECRET_MAX];
        u32 c_plan_ahead;

diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index 86c8bc5ac603d23050a1da1c4d6e23edd8d277b9..26d7763d5255a9a640727c93f18ea99d107cd201 100644 (file)
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -888,14 +888,14 @@ int drbd_send_sync_param(struct drbd_conf *mdev)
 
        if (get_ldev(mdev)) {
                dc = rcu_dereference(mdev->ldev->disk_conf);
-               p->rate = cpu_to_be32(dc->resync_rate);
+               p->resync_rate = cpu_to_be32(dc->resync_rate);
                p->c_plan_ahead = cpu_to_be32(dc->c_plan_ahead);
                p->c_delay_target = cpu_to_be32(dc->c_delay_target);
                p->c_fill_target = cpu_to_be32(dc->c_fill_target);
                p->c_max_rate = cpu_to_be32(dc->c_max_rate);
                put_ldev(mdev);
        } else {
-               p->rate = cpu_to_be32(DRBD_RATE_DEF);
+               p->resync_rate = cpu_to_be32(DRBD_RESYNC_RATE_DEF);
                p->c_plan_ahead = cpu_to_be32(DRBD_C_PLAN_AHEAD_DEF);
                p->c_delay_target = cpu_to_be32(DRBD_C_DELAY_TARGET_DEF);
                p->c_fill_target = cpu_to_be32(DRBD_C_FILL_TARGET_DEF);

diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index e4e8f8a408d194d5c0b9d4527352d9f8f6821866..684f795427274de06bd398ea903ce79af9042c22 100644 (file)
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -3221,7 +3221,7 @@ static int receive_SyncParam(struct drbd_tconn *tconn, struct packet_info *pi)
                old_disk_conf = mdev->ldev->disk_conf;
                *new_disk_conf = *old_disk_conf;
 
-               new_disk_conf->resync_rate = be32_to_cpu(p->rate);
+               new_disk_conf->resync_rate = be32_to_cpu(p->resync_rate);
        }
 
        if (apv >= 88) {

diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 6aece551d87ee1239f996ffad7c0952baf4f2520..778708d9293969969bc4fc8527c7f8aa1ceb8008 100644 (file)
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -113,7 +113,7 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
        __u32_field_def(6, GENLA_F_MANDATORY,   on_io_error, DRBD_ON_IO_ERROR_DEF)
        __u32_field_def(7, GENLA_F_MANDATORY,   fencing, DRBD_FENCING_DEF)
 
-       __u32_field_def(8,      GENLA_F_MANDATORY,      resync_rate, DRBD_RATE_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(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)

diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h
index 3d3e2d5125cb69b2900cde5d8cff5cb1c3ffa3e2..48339ae69d50c88bb77e2de4f32b9a1174291235 100644 (file)
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
@@ -98,10 +98,11 @@
 
 /* syncer { */
   /* FIXME allow rate to be zero? */
-#define DRBD_RATE_MIN 1
+#define DRBD_RESYNC_RATE_MIN 1
 /* channel bonding 10 GbE, or other hardware */
-#define DRBD_RATE_MAX (4 << 20)
-#define DRBD_RATE_DEF 250  /* kb/second */
+#define DRBD_RESYNC_RATE_MAX (4 << 20)
+#define DRBD_RESYNC_RATE_DEF 250
+#define DRBD_RESYNC_RATE_SCALE 'k'  /* kilobytes */
 
   /* less than 7 would hit performance unnecessarily.
    * 919 slots context information per transaction,