| Message ID | 1555149542.2995.15.camel@HansenPartnership.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 5c2442fd78998af60e13aba506d103f7f43f8701 |
| Headers | show |
| Series | [GIT,PULL] SCSI fixes for 5.1-rc4 | expand |
The pull request you sent on Sat, 13 Apr 2019 11:59:02 +0200:
> git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/87af0c3813570193c6708f6fddbf85178a5bab7e
Thank you!
diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 462560b2855e..469d0bc9f5fe 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1713,8 +1713,11 @@ csio_scsi_err_handler(struct csio_hw *hw, struct csio_ioreq *req) } out: - if (req->nsge > 0) + if (req->nsge > 0) { scsi_dma_unmap(cmnd); + if (req->dcopy && (host_status == DID_OK)) + host_status = csio_scsi_copy_to_sgl(hw, req); + } cmnd->result = (((host_status) << 16) | scsi_status); cmnd->scsi_done(cmnd);
One obvious fix for a ciostor data corruption on error bug. The patch is available here: git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes The short changelog is: Varun Prakash (1): scsi: csiostor: fix missing data copy in csio_scsi_err_handler() And the diffstat: drivers/scsi/csiostor/csio_scsi.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) With full diff below. James ---