summaryrefslogtreecommitdiffstats
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorLars Ellenberg2011-07-15 23:52:44 +0200
committerPhilipp Reisner2012-11-08 16:58:00 +0100
commit97ddb68790891ed568ab8212189f5173dd600ea4 (patch)
tree172603f7fb027f172e2eff33e93eb858bc000b1f /drivers/block/drbd/drbd_req.c
parentdrbd: Get rid of MR_{READ,WRITE}_SHIFT (diff)
downloadkernel-qcow2-linux-97ddb68790891ed568ab8212189f5173dd600ea4.tar.gz
kernel-qcow2-linux-97ddb68790891ed568ab8212189f5173dd600ea4.tar.xz
kernel-qcow2-linux-97ddb68790891ed568ab8212189f5173dd600ea4.zip
drbd: detach must not try to abort non-local requests
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_req.c')
-rw-r--r--drivers/block/drbd/drbd_req.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index d0f73b3a6796..60fc186d0a3d 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -436,6 +436,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
/* so we can verify the handle in the answer packet
* corresponding hlist_del is in _req_may_be_done() */
+ D_ASSERT(drbd_interval_empty(&req->i));
drbd_insert_interval(&mdev->read_requests, &req->i);
set_bit(UNPLUG_REMOTE, &mdev->flags);
@@ -453,6 +454,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
/* from __drbd_make_request only */
/* corresponding hlist_del is in _req_may_be_done() */
+ D_ASSERT(drbd_interval_empty(&req->i));
drbd_insert_interval(&mdev->write_requests, &req->i);
/* NOTE