dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Lars Ellenberg 2012-01-11 09:46:48 +01:00 committed by Philipp Reisner
parent 6d49e101fd
commit 41c4a0035b
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/block/drbd/drbd_req.c
View File

@ -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? */