Commit 83fd69c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI fixes from James Bottomley:
 "Two small fixes: one in drivers (qla2xxx), and one in the core (sd) to
  try to cope with USB enclosures that silently change reported
  parameters"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: sd: Fix optimal I/O size for devices that change reported values
  scsi: qla2xxx: Fix I/Os being passed down when FC device is being deleted
parents 69c5eea3 ea697a8b

drivers/scsi/qla2xxx/qla_os.c

+2 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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));

CRA Git | Maintained and supported by SUSTech CRA and CCSE