diff options
| author | Lars Ellenberg | 2012-03-26 16:46:39 +0200 |
|---|---|---|
| committer | Philipp Reisner | 2012-11-08 16:58:22 +0100 |
| commit | ea9d6729bd0f90126e910c31cf64ecb5074f43a7 (patch) | |
| tree | 283b7b7379df22f41a91f8d2b52eca787e207eb9 /drivers/block/drbd/drbd_req.c | |
| parent | drbd: make OOS_HANDED_TO_NETWORK its own case (diff) | |
| download | kernel-qcow2-linux-ea9d6729bd0f90126e910c31cf64ecb5074f43a7.tar.gz kernel-qcow2-linux-ea9d6729bd0f90126e910c31cf64ecb5074f43a7.tar.xz kernel-qcow2-linux-ea9d6729bd0f90126e910c31cf64ecb5074f43a7.zip | |
drbd: fix READ_RETRY_REMOTE_CANCELED to not complete if device is suspended
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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index d6198b50ea7c..771f29c80438 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -523,6 +523,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, drbd_queue_work(&mdev->tconn->data.work, &req->w); break; + case READ_RETRY_REMOTE_CANCELED: case SEND_CANCELED: case SEND_FAILED: /* real cleanup will be done from tl_clear. just update flags @@ -564,9 +565,6 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what, _req_may_be_done_not_susp(req, m); break; - case READ_RETRY_REMOTE_CANCELED: - req->rq_state &= ~RQ_NET_QUEUED; - /* fall through, in case we raced with drbd_disconnect */ case CONNECTION_LOST_WHILE_PENDING: /* transfer log cleanup after connection loss */ /* assert something? */ |