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:46 +0100
commite544046ab842ab93c275a6fc4e043c1cb637076d (patch)
treea27a297d4ab46d58db657c5a320fcb654ab835ce
parentd0c980e236243cd03aa2291243587ac1ba3c2b04 (diff)
downloadvexpress-lsk-e544046ab842ab93c275a6fc4e043c1cb637076d.tar.gz
drbd: Turn no-md-flushes into md-flushes={yes|no}
Change the --no-md-flushes drbdsetup command line option as well as the no_md_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_nl.c6
-rw-r--r--include/linux/drbd_genl.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index 9af097416e2..4a946a877bd 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1449,10 +1449,10 @@ int drbd_adm_attach(struct sk_buff *skb, struct genl_info *info)
/* Reset the "barriers don't work" bits here, then force meta data to
* be written, to ensure we determine if barriers are supported. */
- if (new_disk_conf->no_md_flush)
- set_bit(MD_NO_FUA, &mdev->flags);
- else
+ if (new_disk_conf->md_flushes)
clear_bit(MD_NO_FUA, &mdev->flags);
+ else
+ set_bit(MD_NO_FUA, &mdev->flags);
/* Point of no return reached.
* Devices and memory are no longer released by error cleanup below.
diff --git a/include/linux/drbd_genl.h b/include/linux/drbd_genl.h
index 30ad6600b44..53518fc2315 100644
--- a/include/linux/drbd_genl.h
+++ b/include/linux/drbd_genl.h
@@ -125,7 +125,7 @@ GENL_struct(DRBD_NLA_DISK_CONF, 3, disk_conf,
__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, disk_drain, 1)
- __flg_field_def(19, GENLA_F_MANDATORY, no_md_flush, 0)
+ __flg_field_def(19, GENLA_F_MANDATORY, md_flushes, 1)
)
GENL_struct(DRBD_NLA_RESOURCE_OPTS, 4, res_opts,