SCSI fixes for 5.6-rc7
Subsystems (2)
James Bottomley
maintainerTwo small fixes, one in drivers (qla2xxx) and one in the core (sd) to try to cope with USB enclosures that silently change reported parameters.
The patch is available here:
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi-fixes
The short changelog is:
Arun Easi (1):
scsi: qla2xxx: Fix I/Os being passed down when FC device is being deleted
Martin K. Petersen (1):
scsi: sd: Fix optimal I/O size for devices that change reported values
And the diffstat:
drivers/scsi/qla2xxx/qla_os.c | 4 ++-- drivers/scsi/sd.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-)
With full diff below.
James
---
drivers/scsi/qla2xxx/qla_os.c +2 -2
@@ -864,7 +864,7 @@ qla2xxx_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) goto qc24_fail_command; } -if (atomic_read (&fcport->state) !=FCS_ONLINE ) { +if (atomic_read (&fcport->state) !=FCS_ONLINE || fcport->deleted) {if (atomic_read (&fcport->state) ==FCS_DEVICE_DEAD ||atomic_read (&base_vha->loop_state) ==LOOP_DEAD ) { ql_dbg(ql_dbg_io, vha, 0x3005,
@@ -946,7 +946,7 @@ qla2xxx_mqueuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd, goto qc24_fail_command; } -if (atomic_read (&fcport->state) !=FCS_ONLINE ) { +if (atomic_read (&fcport->state) !=FCS_ONLINE || fcport->deleted) {if (atomic_read (&fcport->state) ==FCS_DEVICE_DEAD ||atomic_read (&base_vha->loop_state) ==LOOP_DEAD ) { ql_dbg(ql_dbg_io, vha, 0x3077,
drivers/scsi/sd.c +3 -1
@@ -3169,9 +3169,11 @@ static int sd_revalidate_disk(struct gendisk *disk)if (sd_validate_opt_xfer_size (sdkp, dev_max)) { q->limits.io_opt =logical_to_bytes (sdp, sdkp->opt_xfer_blocks); rw_max =logical_to_sectors (sdp, sdkp->opt_xfer_blocks); - }else + }else { + q->limits.io_opt =0 ; rw_max =min_not_zero (logical_to_sectors (sdp, dev_max), (sector_t )BLK_DEF_MAX_SECTORS ); + }/* Do not exceed controller limit */ rw_max =min (rw_max,queue_max_hw_sectors (q));
The pull request you sent on Sat, 28 Mar 2020 08:25:45 -0700:
The pull request you sent on Sat, 28 Mar 2020 08:25:45 -0700:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.gitscsi-fixes
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/83fd69c93340177dcd66fd26ce6441fb581c1dbf
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker