summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-05-11 14:29:52 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:55:50 +0100
commit6394b9358e6187414b7a6de7ba2c681ee4a790ac (patch)
tree0750ef2de127925d86f726287b726792f8b43cb8 /include
parent7dc1d67f7c324e5bf23883b94508112ca7a70f62 (diff)
downloadlinux-stable-6394b9358e6187414b7a6de7ba2c681ee4a790ac.tar.gz
linux-stable-6394b9358e6187414b7a6de7ba2c681ee4a790ac.tar.bz2
linux-stable-6394b9358e6187414b7a6de7ba2c681ee4a790ac.zip
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>
Diffstat (limited to 'include')
-rw-r--r--include/linux/drbd_genl.h2
-rw-r--r--include/linux/drbd_limits.h7
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 6aece551d87e..778708d92939 100644
--- 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 3d3e2d5125cb..48339ae69d50 100644
--- 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,