aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/drbd/drbd_req.c
diff options
context:
space:
mode:
authorLars Ellenberg <lars.ellenberg@linbit.com>2012-01-11 09:46:48 +0100
committerPhilipp Reisner <philipp.reisner@linbit.com>2012-05-09 15:16:48 +0200
commit41c4a0035b36d400b79cbd945390a76e909711a7 (patch)
treeecfc9c36addad208e1416aef84d7ffe9ff1a737f /drivers/block/drbd/drbd_req.c
parent6d49e101fd3d3dbd525564923a82fb8a66676420 (diff)
downloadvexpress-lsk-41c4a0035b36d400b79cbd945390a76e909711a7.tar.gz
drbd: fix READ_RETRY_REMOTE_CANCELED to not complete if device is suspended
READ_RETRY_REMOTE_CANCELED needs to be grouped with the other _CANCELED cases, not with CONNECTION_LOST_WHILE_PENDING, as that would complete (fail) the bio even if the device became 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.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index bfed0834cd6..2a246ac84d7 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -569,6 +569,7 @@ int __req_mod(struct drbd_request *req, enum drbd_req_event what,
drbd_queue_work(&mdev->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
@@ -610,9 +611,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? */