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

Commit b707c65a authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/scm_blk: fix deadlock for requests != REQ_TYPE_FS 



When we refuse a non REQ_TYPE_FS request in the build request function
we already hold the queue lock. Thus we must not call blk_end_request_all
but __blk_end_request_all.

Reported-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Fixes: de9587a2 ('s390/scm_blk: fix endless loop for requests != REQ_TYPE_FS')
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 6ddf37da

drivers/s390/block/scm_blk.c

+1 −1
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ static void scm_blk_request(struct request_queue *rq) 
		if (req->cmd_type != REQ_TYPE_FS) {

			blk_start_request(req);

			blk_dump_rq_flags(req, KMSG_COMPONENT " bad request");

			blk_end_request_all(req, -EIO);

			__blk_end_request_all(req, -EIO);

			continue;

		}