aboutsummaryrefslogtreecommitdiff
path: root/drivers
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
parent9ed57dcbda37a1a1fb25ccda4206cc417e54e813 (diff)
downloadvexpress-lsk-27eb13e99b515c52ba5a151a1acce6afb8a9b2b6.tar.gz
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')
-rw-r--r--drivers/block/drbd/drbd_nl.c3
-rw-r--r--drivers/block/drbd/drbd_receiver.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index c5aa08474a3..ce9f4ca55ce 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)
diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
index 786a7551079..e8cd4c4acc6 100644
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
@@ -1229,7 +1229,7 @@ void drbd_bump_write_ordering(struct drbd_tconn *tconn, enum write_ordering_e wo
wo = min(pwo, wo);
rcu_read_lock();
idr_for_each_entry(&tconn->volumes, mdev, vnr) {
- if (!get_ldev(mdev))
+ if (!get_ldev_if_state(mdev, D_ATTACHING))
continue;
dc = rcu_dereference(mdev->ldev->disk_conf);