From: Sebastian Ott <sebott@linux.vnet.ibm.com>
Date: Tue, 22 Mar 2016 18:00:55 +0000 (+0100)
Subject: s390/scm_blk: fix deadlock for requests != REQ_TYPE_FS
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b707c65ae70e24c47a0ce4a7279224ce8f0ffb7f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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: 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
index 75d9896deccb..e6f54d3b8969 100644
--- 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;
 		}