aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/drbd/drbd_worker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 62bde5ae17f7..5fc60f622bed 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -1537,14 +1537,14 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side)
1537 } 1537 }
1538 1538
1539 drbd_state_lock(mdev); 1539 drbd_state_lock(mdev);
1540 1540 write_lock_irq(&global_state_lock);
1541 if (!get_ldev_if_state(mdev, D_NEGOTIATING)) { 1541 if (!get_ldev_if_state(mdev, D_NEGOTIATING)) {
1542 write_unlock_irq(&global_state_lock);
1542 drbd_state_unlock(mdev); 1543 drbd_state_unlock(mdev);
1543 return; 1544 return;
1544 } 1545 }
1545 1546
1546 write_lock_irq(&global_state_lock); 1547 ns.i = mdev->state.i;
1547 ns = mdev->state;
1548 1548
1549 ns.aftr_isp = !_drbd_may_sync_now(mdev); 1549 ns.aftr_isp = !_drbd_may_sync_now(mdev);
1550 1550