From 96c6bea06906be87e71d15ea2f62169c64c8d7e2 Mon Sep 17 00:00:00 2001
From: Lars Ellenberg <lars.ellenberg@linbit.com>
Date: Fri, 26 Oct 2012 00:41:50 +0200
Subject: [PATCH] --- yaml --- r: 346294 b: refs/heads/master c:
 691631c0652bc47e6d20b0d981e23a9025fd794e h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/drbd/drbd_nl.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e64dcbe19469..5f636a3f49a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 298307ed1d2ac4815b0ce9a5f1c9cc643f4a9aca
+refs/heads/master: 691631c0652bc47e6d20b0d981e23a9025fd794e
diff --git a/trunk/drivers/block/drbd/drbd_nl.c b/trunk/drivers/block/drbd/drbd_nl.c
index 76bb3a684b86..536f94a1ba5d 100644
--- a/trunk/drivers/block/drbd/drbd_nl.c
+++ b/trunk/drivers/block/drbd/drbd_nl.c
@@ -1230,6 +1230,11 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
 	else
 		mdev->ldev->md.flags |= MDF_AL_DISABLED;
 
+	if (new_disk_conf->md_flushes)
+		clear_bit(MD_NO_FUA, &mdev->flags);
+	else
+		set_bit(MD_NO_FUA, &mdev->flags);
+
 	drbd_bump_write_ordering(mdev->tconn, WO_bdev_flush);
 
 	drbd_md_sync(mdev);