summaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2016-03-22 19:00:55 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-04-01 17:20:54 +0200
commitb707c65ae70e24c47a0ce4a7279224ce8f0ffb7f (patch)
treed412c1f85904794f0c5ab59e93321b9909c88e62 /drivers/s390
parent6ddf37da05cd71bf9e43349d607e810b43c9008a (diff)
downloadblackbird-op-linux-b707c65ae70e24c47a0ce4a7279224ce8f0ffb7f.tar.gz
blackbird-op-linux-b707c65ae70e24c47a0ce4a7279224ce8f0ffb7f.zip
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>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/block/scm_blk.c2
1 files changed, 1 insertions, 1 deletions
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;
}
OpenPOWER on IntegriCloud