aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@linbit.com>2011-05-04 15:25:35 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:55:45 +0100
commit66b2f6b9c59c5e7003e13281dfe72e174f93988c (patch)
tree4867d12b1876bf8c3291390c759fc9b92a795bf1
parenta5d8e1fb9d22851de89bbf52db6b11c56b895dd4 (diff)
downloadvexpress-lsk-66b2f6b9c59c5e7003e13281dfe72e174f93988c.tar.gz
drbd: Turn no-disk-flushes into disk-flushes={yes|no}
Change the --no-disk-flushes drbdsetup command line option as well as the no_disk_flush netlink packet. 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_receiver.c2
-rw-r--r--include/linux/drbd_genl.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 83d39859a9f..e7a6eeae94e 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1179,7 +1179,7 @@ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo)
rcu_read_lock();
dc = rcu_dereference(mdev->ldev->disk_conf);
- if (wo == WO_bdev_flush && dc->no_disk_flush)
+ if (wo == WO_bdev_flush && !dc->disk_flushes)
wo = WO_drain_io;
if (wo == WO_drain_io && dc->no_disk_drain)
wo = WO_none;
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index f143e3c0f33..945c4dd3470 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -122,8 +122,8 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
__u32_field_def(14, GENLA_F_MANDATORY, c_max_rate, DRBD_C_MAX_RATE_DEF)
__u32_field_def(15, GENLA_F_MANDATORY, c_min_rate, DRBD_C_MIN_RATE_DEF)
- __flg_field_def(16, GENLA_F_MANDATORY, no_disk_barrier, 0)
- __flg_field_def(17, GENLA_F_MANDATORY, no_disk_flush, 0)
+ __flg_field_def(16, GENLA_F_MANDATORY, disk_barrier, 1)
+ __flg_field_def(17, GENLA_F_MANDATORY, disk_flushes, 1)
__flg_field_def(18, GENLA_F_MANDATORY, no_disk_drain, 0)
__flg_field_def(19, GENLA_F_MANDATORY, no_md_flush, 0)
)