drbd: move put_ldev from __req_mod() to the endio callback
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index f6a785b..f708aa1 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -416,7 +416,6 @@
maybe_wakeup_conflicting_requests(req);
req_may_be_completed_not_susp(req, m);
- put_ldev(mdev);
break;
case ABORT_DISK_IO:
@@ -434,7 +433,6 @@
__drbd_chk_io_error(mdev, false);
maybe_wakeup_conflicting_requests(req);
req_may_be_completed_not_susp(req, m);
- put_ldev(mdev);
break;
case READ_AHEAD_COMPLETED_WITH_ERROR:
@@ -442,7 +440,6 @@
req->rq_state |= RQ_LOCAL_COMPLETED;
req->rq_state &= ~RQ_LOCAL_PENDING;
req_may_be_completed_not_susp(req, m);
- put_ldev(mdev);
break;
case READ_COMPLETED_WITH_ERROR:
@@ -454,7 +451,6 @@
D_ASSERT(!(req->rq_state & RQ_NET_MASK));
__drbd_chk_io_error(mdev, false);
- put_ldev(mdev);
goto_queue_for_net_read:
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
index 3adbc5a..f104517 100644
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
@@ -238,6 +238,7 @@
spin_lock_irqsave(&mdev->tconn->req_lock, flags);
__req_mod(req, what, &m);
spin_unlock_irqrestore(&mdev->tconn->req_lock, flags);
+ put_ldev(mdev);
if (m.bio)
complete_master_bio(mdev, &m);