s390/scm_blk: fix deadlock for requests != REQ_TYPE_FS

Sebastian Ott · Martin Schwidefsky · commit b707c65ae70e · 2016-04-01T17:20:54.000+02:00
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: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Fixes: de9587a ('s390/scm_blk: fix endless loop for requests != REQ_TYPE_FS') Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c
@@ -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;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ static void scm_blk_request(struct request_queue *rq)`
`303`	`303`	`if (req->cmd_type != REQ_TYPE_FS) {`
`304`	`304`	`blk_start_request(req);`
`305`	`305`	`blk_dump_rq_flags(req, KMSG_COMPONENT " bad request");`
`306`		`- blk_end_request_all(req, -EIO);`
	`306`	`+ __blk_end_request_all(req, -EIO);`
`307`	`307`	`continue;`
`308`	`308`	`}`
`309`	`309`