From 4d9b9971d08b7d05edac2501c1f4ce9a9b5d521b Mon Sep 17 00:00:00 2001 From: Philipp Reisner Date: Thu, 6 Oct 2011 18:29:14 +0200 Subject: [PATCH] --- yaml --- r: 309321 b: refs/heads/master c: aaae506d545bb9d06f4d8362f670f406f12e4b58 h: refs/heads/master i: 309319: 09b12ced426eae4040b0b8051828e781bb5b8a56 v: v3 --- [refs] | 2 +- trunk/drivers/block/drbd/drbd_worker.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6bba9ec46506..302fe983a18d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6a9a92f4ef05bb3e94bbfe123c21482fa5da9866 +refs/heads/master: aaae506d545bb9d06f4d8362f670f406f12e4b58 diff --git a/trunk/drivers/block/drbd/drbd_worker.c b/trunk/drivers/block/drbd/drbd_worker.c index 62bde5ae17f7..5fc60f622bed 100644 --- a/trunk/drivers/block/drbd/drbd_worker.c +++ b/trunk/drivers/block/drbd/drbd_worker.c @@ -1537,14 +1537,14 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side) } drbd_state_lock(mdev); - + write_lock_irq(&global_state_lock); if (!get_ldev_if_state(mdev, D_NEGOTIATING)) { + write_unlock_irq(&global_state_lock); drbd_state_unlock(mdev); return; } - write_lock_irq(&global_state_lock); - ns = mdev->state; + ns.i = mdev->state.i; ns.aftr_isp = !_drbd_may_sync_now(mdev);