drbd: fix potential spinlock deadlock
authorPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 17 Nov 2011 09:11:47 +0000 (10:11 +0100)
committerPhilipp Reisner <philipp.reisner@linbit.com>
Thu, 8 Nov 2012 15:58:09 +0000 (16:58 +0100)
commit975b297947c85a1cb687d7561b6fc05d48160026
treee72ba4a70a1d532c5eff3764f4481485313721a6
parent77fede5137574813e415a4cf23038b6688ba2470
drbd: fix potential spinlock deadlock

drbd_try_clear_on_disk_bm() has a sanity check for the number of blocks
left to be resynced (rs_left) in the current resync extent.
If it detects a mismatch, it complains, and forces a disconnect using
drbd_force_state(mdev, NS(conn, C_DISCONNECTING));

Unfortunately, this may be called while holding the req_lock,
and drbd_force_state() want's to aquire that lock itself. Deadlock.

Don't force a disconnect, but fix up rs_left by recounting and
reassigning the number of dirty blocks in that extent.

Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
drivers/block/drbd/drbd_actlog.c