diff options
author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2011-07-15 17:52:44 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-11-08 10:58:00 -0500 |
commit | 97ddb68790891ed568ab8212189f5173dd600ea4 (patch) | |
tree | 172603f7fb027f172e2eff33e93eb858bc000b1f /drivers/block/drbd/drbd_req.c | |
parent | f497609e4c50c6162b51359d560f2454b184e0ec (diff) |
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.c | 2 |
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, | |||
436 | 436 | ||
437 | /* so we can verify the handle in the answer packet | 437 | /* so we can verify the handle in the answer packet |
438 | * corresponding hlist_del is in _req_may_be_done() */ | 438 | * corresponding hlist_del is in _req_may_be_done() */ |
439 | D_ASSERT(drbd_interval_empty(&req->i)); | ||
439 | drbd_insert_interval(&mdev->read_requests, &req->i); | 440 | drbd_insert_interval(&mdev->read_requests, &req->i); |
440 | 441 | ||
441 | set_bit(UNPLUG_REMOTE, &mdev->flags); | 442 | set_bit(UNPLUG_REMOTE, &mdev->flags); |
@@ -453,6 +454,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, | |||
453 | /* from __drbd_make_request only */ | 454 | /* from __drbd_make_request only */ |
454 | 455 | ||
455 | /* corresponding hlist_del is in _req_may_be_done() */ | 456 | /* corresponding hlist_del is in _req_may_be_done() */ |
457 | D_ASSERT(drbd_interval_empty(&req->i)); | ||
456 | drbd_insert_interval(&mdev->write_requests, &req->i); | 458 | drbd_insert_interval(&mdev->write_requests, &req->i); |
457 | 459 | ||
458 | /* NOTE | 460 | /* NOTE |