diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-22 20:22:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-22 20:22:31 +0100 |
| commit | 8395ae05cb5a2e31d36106e8c85efa11cda849be (patch) | |
| tree | 8f1c5ec6f131591ff7d0de772f3b4d7be20cc3f9 /drivers/scsi/sg.c | |
| parent | Merge tag 'afs-next-20221222' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | scsi: qla2xxx: Fix crash when I/O abort times out (diff) | |
| download | linux-8395ae05cb5a2e31d36106e8c85efa11cda849be.tar.xz linux-8395ae05cb5a2e31d36106e8c85efa11cda849be.zip | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull more SCSI updates from James Bottomley:
"Mostly small bug fixes and small updates.
The only things of note is a qla2xxx fix for crash on hotplug and
timeout and the addition of a user exposed abstraction layer for
persistent reservation error return handling (which necessitates the
conversion of nvme.c as well as SCSI)"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: qla2xxx: Fix crash when I/O abort times out
nvme: Convert NVMe errors to PR errors
scsi: sd: Convert SCSI errors to PR errors
scsi: core: Rename status_byte to sg_status_byte
block: Add error codes for common PR failures
scsi: sd: sd_zbc: Trace zone append emulation
scsi: libfc: Include the correct header
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 12344be14232..ff9854f59964 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1349,7 +1349,7 @@ sg_rq_end_io(struct request *rq, blk_status_t status) struct scsi_sense_hdr sshdr; srp->header.status = 0xff & result; - srp->header.masked_status = status_byte(result); + srp->header.masked_status = sg_status_byte(result); srp->header.msg_status = COMMAND_COMPLETE; srp->header.host_status = host_byte(result); srp->header.driver_status = driver_byte(result); |