diff options
| author | Joe Lawrence <[email protected]> | 2014-08-28 14:15:21 +0000 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2014-08-28 16:03:46 +0000 |
| commit | a492f075450f3ba87de36e5ffe92a9d0c7af9723 (patch) | |
| tree | 61960a71c7fde0eee3d77cda460154d2f7715d2f /drivers/scsi/scsi_error.c | |
| parent | block,scsi: verify return pointer from blk_get_request (diff) | |
| download | kernel-a492f075450f3ba87de36e5ffe92a9d0c7af9723.tar.gz kernel-a492f075450f3ba87de36e5ffe92a9d0c7af9723.zip | |
block,scsi: fixup blk_get_request dead queue scenarios
The blk_get_request function may fail in low-memory conditions or during
device removal (even if __GFP_WAIT is set). To distinguish between these
errors, modify the blk_get_request call stack to return the appropriate
ERR_PTR. Verify that all callers check the return status and consider
IS_ERR instead of a simple NULL pointer check.
For consistency, make a similar change to the blk_mq_alloc_request leg
of blk_get_request. It may fail if the queue is dead, or the caller was
unwilling to wait.
Signed-off-by: Joe Lawrence <[email protected]>
Acked-by: Jiri Kosina <[email protected]> [for pktdvd]
Acked-by: Boaz Harrosh <[email protected]> [for osd]
Reviewed-by: Jeff Moyer <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
Diffstat (limited to 'drivers/scsi/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 4c433bf47a06..a2c3d3d255a1 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1960,7 +1960,7 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) * request becomes available */ req = blk_get_request(sdev->request_queue, READ, GFP_KERNEL); - if (!req) + if (IS_ERR(req)) return; blk_rq_set_block_pc(req); |
