diff options
| author | Philipp Reisner | 2010-06-23 11:20:05 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2010-10-14 15:04:46 +0200 |
| commit | 84dfb9f564208a0331131d1ab922382c7d61a553 (patch) | |
| tree | 1506d6c318afa4a94b13bab6af983031eac5e3cd /drivers/block/drbd/drbd_main.c | |
| parent | drbd: Do not do a hard state change when establishing a connection [bugz 304] (diff) | |
| download | kernel-qcow2-linux-84dfb9f564208a0331131d1ab922382c7d61a553.tar.gz kernel-qcow2-linux-84dfb9f564208a0331131d1ab922382c7d61a553.tar.xz kernel-qcow2-linux-84dfb9f564208a0331131d1ab922382c7d61a553.zip | |
drbd: Fixed a deadlock, probably only affected UP machines
After disconnect (most likely mdev->net_cnt == 0) and we are
still in an unstable state (!drbd_state_is_stable()). When we
get an IO request in drbd_get_max_buffers() (called from
__inc_ap_bio_cond(), called from inc_ap_bio()) we wake up
misc_wait. Misc_wait is also used in inc_ap_bio() to sleep
until the outcome of __inc_ap_bio_cond() changes. => Busy loop!
Solution: Have a dedicated wait queue for get_net_conf() and
put_net_conf().
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_main.c')
| -rw-r--r-- | drivers/block/drbd/drbd_main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 440b1d5dcfe2..9fe9bdd9e33d 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -2763,6 +2763,7 @@ void drbd_init_set_defaults(struct drbd_conf *mdev) init_waitqueue_head(&mdev->misc_wait); init_waitqueue_head(&mdev->state_wait); + init_waitqueue_head(&mdev->net_cnt_wait); init_waitqueue_head(&mdev->ee_wait); init_waitqueue_head(&mdev->al_wait); init_waitqueue_head(&mdev->seq_wait); |