diff options
| author | Sebastian Ott <sebott@linux.vnet.ibm.com> | 2016-03-22 19:00:55 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2016-06-15 21:29:22 +0100 |
| commit | 74599272b052bf13a9520d634224b862deaf4d24 (patch) | |
| tree | 9e2d8f4e2455cc18b63929bf26d17ebbec14ae14 /drivers/s390 | |
| parent | 8eb71f12aad899a8e182c2c459112dafb72b82e2 (diff) | |
| download | linux-stable-74599272b052bf13a9520d634224b862deaf4d24.tar.gz linux-stable-74599272b052bf13a9520d634224b862deaf4d24.tar.bz2 linux-stable-74599272b052bf13a9520d634224b862deaf4d24.zip | |
s390/scm_blk: fix deadlock for requests != REQ_TYPE_FS
commit b707c65ae70e24c47a0ce4a7279224ce8f0ffb7f upstream.
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/block/scm_blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/block/scm_blk.c b/drivers/s390/block/scm_blk.c index 76bed1743db1..bc1ea58040d7 100644 --- a/drivers/s390/block/scm_blk.c +++ b/drivers/s390/block/scm_blk.c @@ -210,7 +210,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; } |