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

Commit ea9d6729 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 



Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
parent 27a434fe

drivers/block/drbd/drbd_req.c

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