Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 41c4a003 authored by Lars Ellenberg's avatar Lars Ellenberg Committed by Philipp Reisner
Browse files

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: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 6d49e101

drivers/block/drbd/drbd_req.c

+1 −3
Original line number Diff line number Diff line
@@ -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? */