aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
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
commitd0c980e236243cd03aa2291243587ac1ba3c2b04 (patch)
tree1e678fae4d991a1195743f3b7a1e1a45ae7a00de /drivers
parentdrbd: Turn no-disk-flushes into disk-flushes={yes|no} (diff)
downloadlinux-dev-d0c980e236243cd03aa2291243587ac1ba3c2b04.tar.xz
linux-dev-d0c980e236243cd03aa2291243587ac1ba3c2b04.zip
drbd: Turn no-disk-drain into disk-drain={yes|no}
Change the --no-disk-drain drbdsetup command line option as well as the no_disk_drain netlink packet. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index e7a6eeae94e2..5d1bdda8ec9f 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1181,7 +1181,7 @@ void drbd_bump_write_ordering(struct drbd_conf *mdev, enum write_ordering_e wo)
if (wo == WO_bdev_flush && !dc->disk_flushes)
wo = WO_drain_io;
- if (wo == WO_drain_io && dc->no_disk_drain)
+ if (wo == WO_drain_io && !dc->disk_drain)
wo = WO_none;
rcu_read_unlock();
mdev->write_ordering = wo;