summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_receiver.c
diff options
context:
space:
mode:
authorPhilipp Reisner2012-03-30 14:12:15 +0200
committerPhilipp Reisner2012-11-08 16:58:25 +0100
commit27eb13e99b515c52ba5a151a1acce6afb8a9b2b6 (patch)
tree5b9046d339f29dc22a5f57cfd5650d5db33d9e7f /drivers/block/drbd/drbd_receiver.c
parentdrbd: ignore volume number for drbd barrier packet exchange (diff)
downloadkernel-qcow2-linux-27eb13e99b515c52ba5a151a1acce6afb8a9b2b6.tar.gz
kernel-qcow2-linux-27eb13e99b515c52ba5a151a1acce6afb8a9b2b6.tar.xz
kernel-qcow2-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_receiver.c')
-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 786a75510798..e8cd4c4acc65 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);