summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2010-10-05 11:19:39 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2010-10-14 18:38:42 +0200
commit00b425377d60e67e86721d4ce6d7cbf131a5d0fd (patch)
tree7e815cbdc90ebd1c801157f707e1e278a739ed68
parentf65363cfa05fe60874030461a0eeb84b7e60cba4 (diff)
downloadop-kernel-dev-00b425377d60e67e86721d4ce6d7cbf131a5d0fd.zip
op-kernel-dev-00b425377d60e67e86721d4ce6d7cbf131a5d0fd.tar.gz
drbd: Allow larger values for c-fill-target.
Connections through a compressing proxy might have more bits on the fly. 500MByte instead of 50MByte Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
-rw-r--r--drivers/block/drbd/drbd_int.h2
-rw-r--r--include/linux/drbd_limits.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
index ff7fffa..1680939 100644
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
@@ -348,7 +348,7 @@ struct p_header80 {
struct p_header95 {
u16 magic; /* use DRBD_MAGIC_BIG here */
u16 command;
- u32 length;
+ u32 length; /* Use only 24 bits of that. Ignore the highest 8 bit. */
u8 payload[0];
} __packed;
diff --git a/include/linux/drbd_limits.h b/include/linux/drbd_limits.h
index 0b24ded..4ac33f3 100644
--- a/include/linux/drbd_limits.h
+++ b/include/linux/drbd_limits.h
@@ -143,7 +143,7 @@
#define DRBD_C_DELAY_TARGET_DEF 10
#define DRBD_C_FILL_TARGET_MIN 0
-#define DRBD_C_FILL_TARGET_MAX 100000
+#define DRBD_C_FILL_TARGET_MAX (1<<20) /* 500MByte in sec */
#define DRBD_C_FILL_TARGET_DEF 0 /* By default disabled -> controlled by delay_target */
#define DRBD_C_MAX_RATE_MIN 250 /* kByte/sec */
OpenPOWER on IntegriCloud