From 4a27f994fde53b51ef076fab678f42864a71164e Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Wed, 4 May 2011 15:25:35 +0200 Subject: [PATCH] --- yaml --- r: 346051 b: refs/heads/master c: d0c980e236243cd03aa2291243587ac1ba3c2b04 h: refs/heads/master i: 346049: 0bec45374b784f53dd12a00e7363526303bcc77a 346047: 3eb87e133d3f53a7bb63aba8421ab4a3438377ae v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_receiver.c | 2 +- trunk/include/linux/drbd_genl.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0ed540151397..a75fbd5d361e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 66b2f6b9c59c5e7003e13281dfe72e174f93988c +refs/heads/master: d0c980e236243cd03aa2291243587ac1ba3c2b04 diff --git a/trunk/drivers/block/drbd/drbd_receiver.c b/trunk/drivers/block/drbd/drbd_receiver.c index e7a6eeae94e2..5d1bdda8ec9f 100644 --- a/trunk/drivers/block/drbd/drbd_receiver.c +++ b/trunk/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; diff --git a/trunk/include/linux/drbd_genl.h b/trunk/include/linux/drbd_genl.h index 945c4dd3470c..30ad6600b444 100644 --- a/trunk/include/linux/drbd_genl.h +++ b/trunk/include/linux/drbd_genl.h @@ -124,7 +124,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, no_disk_drain, 0) + __flg_field_def(18, GENLA_F_MANDATORY, disk_drain, 1) __flg_field_def(19, GENLA_F_MANDATORY, no_md_flush, 0) )