summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_nl.c
diff options
context:
space:
mode:
authorPhilipp Reisner <philipp.reisner@linbit.com>2012-03-30 14:12:15 +0200
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-11-08 16:58:25 +0100
commit27eb13e99b515c52ba5a151a1acce6afb8a9b2b6 (patch)
tree5b9046d339f29dc22a5f57cfd5650d5db33d9e7f /drivers/block/drbd/drbd_nl.c
parent9ed57dcbda37a1a1fb25ccda4206cc417e54e813 (diff)
downloadblackbird-op-linux-27eb13e99b515c52ba5a151a1acce6afb8a9b2b6.tar.gz
blackbird-op-linux-27eb13e99b515c52ba5a151a1acce6afb8a9b2b6.zip
drbd: Fixed processing of disk-barrier, disk-flushes and disk-drain
Since drbd_bump_write_ordering() is called in the attaching process while the disk state is D_ATTACHING, it was not considering these three flags during attach. A call to this function was missing form drbd_adm_disk_opts(). Fixed both issues. Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com> Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block/drbd/drbd_nl.c')
-rw-r--r--drivers/block/drbd/drbd_nl.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index c5aa08474a35..ce9f4ca55ce2 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1229,6 +1229,9 @@ int drbd_adm_disk_opts(struct sk_buff *skb, struct genl_info *info)
}
mutex_unlock(&mdev->tconn->conf_update);
+
+ drbd_bump_write_ordering(mdev->tconn, WO_bdev_flush);
+
drbd_md_sync(mdev);
if (mdev->state.conn >= C_CONNECTED)
OpenPOWER on IntegriCloud