* [GIT PULL] SCSI fixes for 5.1-rc4
@ 2019-04-13 9:59 James Bottomley
2019-04-13 22:00 ` pr-tracker-bot
0 siblings, 1 reply; 2+ messages in thread
From: James Bottomley @ 2019-04-13 9:59 UTC (permalink / raw)
To: Andrew Morton, Linus Torvalds; +Cc: linux-scsi, linux-kernel
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
---
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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [GIT PULL] SCSI fixes for 5.1-rc4
2019-04-13 9:59 [GIT PULL] SCSI fixes for 5.1-rc4 James Bottomley
@ 2019-04-13 22:00 ` pr-tracker-bot
0 siblings, 0 replies; 2+ messages in thread
From: pr-tracker-bot @ 2019-04-13 22:00 UTC (permalink / raw)
To: James Bottomley; +Cc: Andrew Morton, Linus Torvalds, linux-scsi, linux-kernel
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!
--
Deet-doot-dot, I am a bot.
https://korg.wiki.kernel.org/userdoc/prtracker
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-04-13 22:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-04-13 9:59 [GIT PULL] SCSI fixes for 5.1-rc4 James Bottomley
2019-04-13 22:00 ` pr-tracker-bot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox