diff options
| author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-06-24 10:05:53 (GMT) |
|---|---|---|
| committer | Philipp Reisner <philipp.reisner@linbit.com> | 2010-10-14 13:05:32 (GMT) |
| commit | 8f488156c0635dcc9c668737d05386113a745ef9 (patch) | |
| tree | 9c589bfbb57ece853b9960c0e835fbc95a1ca8eb /drivers/block | |
| parent | cfa03415a14dd0055f2ff8c3d348d4c1452acba6 (diff) | |
| download | linux-8f488156c0635dcc9c668737d05386113a745ef9.tar.xz | |
drbd: Allow attach while IO is suspended
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/drbd/drbd_nl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c index 921793c..dc0a9ac 100644 --- a/drivers/block/drbd/drbd_nl.c +++ b/drivers/block/drbd/drbd_nl.c @@ -954,7 +954,7 @@ static int drbd_nl_disk_conf(struct drbd_conf *mdev, struct drbd_nl_cfg_req *nlp drbd_suspend_io(mdev); /* also wait for the last barrier ack. */ - wait_event(mdev->misc_wait, !atomic_read(&mdev->ap_pending_cnt)); + wait_event(mdev->misc_wait, !atomic_read(&mdev->ap_pending_cnt) || mdev->state.susp); /* and for any other previously queued work */ drbd_flush_workqueue(mdev); |