Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4fbf44e authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: Fixup device type check 



Fixup a check used by the ipr driver to determine if a given
device is a SCSI disk. Due to the addition of support for
attaching SATA devices, this check needs to be more robust.

Signed-off-by: default avatarBrian King <brking@us.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 1121b794

drivers/scsi/ipr.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3214,7 +3214,7 @@ static int ipr_slave_configure(struct scsi_device *sdev) 
			sdev->timeout = IPR_VSET_RW_TIMEOUT;

			sdev->timeout = IPR_VSET_RW_TIMEOUT;

			blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);

			blk_queue_max_sectors(sdev->request_queue, IPR_VSET_MAX_SECTORS);

		}

		}

		if (IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))

		if (ipr_is_vset_device(res) || ipr_is_scsi_disk(res))

			sdev->allow_restart = 1;

			sdev->allow_restart = 1;

		scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);

		scsi_adjust_queue_depth(sdev, 0, sdev->host->cmd_per_lun);

	}

	}
@@ -4540,7 +4540,7 @@ static int ipr_set_supported_devs(struct ipr_cmnd *ipr_cmd) 
	ipr_cmd->job_step = ipr_ioa_reset_done;

	ipr_cmd->job_step = ipr_ioa_reset_done;





	list_for_each_entry_continue(res, &ioa_cfg->used_res_q, queue) {

	list_for_each_entry_continue(res, &ioa_cfg->used_res_q, queue) {

		if (!IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data))

		if (!ipr_is_scsi_disk(res))

			continue;

			continue;





		ipr_cmd->u.res = res;

		ipr_cmd->u.res = res;

drivers/scsi/ipr.h

+16 −0
Original line number Original line Diff line number Diff line
@@ -1304,6 +1304,22 @@ static inline int ipr_is_gscsi(struct ipr_resource_entry *res) 
		return 0;

		return 0;

}

}





/**

 * ipr_is_scsi_disk - Determine if a resource is a SCSI disk

 * @res:	resource entry struct

 *

 * Return value:

 * 	1 if SCSI disk / 0 if not SCSI disk

 **/

static inline int ipr_is_scsi_disk(struct ipr_resource_entry *res)

{

	if (ipr_is_af_dasd_device(res) ||

	    (ipr_is_gscsi(res) && IPR_IS_DASD_DEVICE(res->cfgte.std_inq_data)))

		return 1;

	else

		return 0;

}



/**

/**

 * ipr_is_naca_model - Determine if a resource is using NACA queueing model

 * ipr_is_naca_model - Determine if a resource is using NACA queueing model

 * @res:	resource entry struct

 * @res:	resource entry struct