renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-17 10:04:14 +08:00
Code

drbd: fix READ_RETRY_REMOTE_CANCELED to not complete if device is suspended

Browse Source 
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-03-26 16:46:39 +02:00 committed by Philipp Reisner
parent 27a434fe40
commit ea9d6729bd
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

@ -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); drbd_queue_work(&mdev->tconn->data.work, &req->w);
break; break;
case READ_RETRY_REMOTE_CANCELED:
case SEND_CANCELED: case SEND_CANCELED:
case SEND_FAILED: case SEND_FAILED:
/* real cleanup will be done from tl_clear. just update flags /* 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); _req_may_be_done_not_susp(req, m);
break; 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: case CONNECTION_LOST_WHILE_PENDING:
/* transfer log cleanup after connection loss */ /* transfer log cleanup after connection loss */
/* assert something? */ /* assert something? */