diff options
| author | Long Li <longli@microsoft.com> | 2014-12-06 04:38:18 +0100 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2014-12-15 13:34:29 +0100 |
| commit | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (patch) | |
| tree | 248e8524421e7f1319c0e2955fcf6fbf6a796476 | |
| parent | ipr: set scsi_level correctly for disk arrays (diff) | |
| download | linux-e86fb5e8ab95f10ec5f2e9430119d5d35020c951.tar.xz linux-e86fb5e8ab95f10ec5f2e9430119d5d35020c951.zip | |
storvsc: ring buffer failures may result in I/O freeze
When ring buffer returns an error indicating retry, storvsc may not
return a proper error code to SCSI when bounce buffer is not used.
This has introduced I/O freeze on RAID running atop storvsc devices.
This patch fixes it by always returning a proper error code.
Signed-off-by: Long Li <longli@microsoft.com>
Reviewed-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
cc: stable@vger.kernel.org
| -rw-r--r-- | drivers/scsi/storvsc_drv.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index e3ba251fb6e7..4cff0ddc2c25 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -1688,13 +1688,12 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) if (ret == -EAGAIN) { /* no more space */ - if (cmd_request->bounce_sgl_count) { + if (cmd_request->bounce_sgl_count) destroy_bounce_buffer(cmd_request->bounce_sgl, cmd_request->bounce_sgl_count); - ret = SCSI_MLQUEUE_DEVICE_BUSY; - goto queue_error; - } + ret = SCSI_MLQUEUE_DEVICE_BUSY; + goto queue_error; } return 0; |