openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] add inline functions for recognising created and blocked states 

The created and blocked states are very shortly going to correspond to
mixed sdev_state states.

Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
James Bottomley 2008-08-22 16:43:59 -05:00
parent 22447be7d1
commit 0f1d87a2ac
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/scsi/scsi.c
View File

@ -664,13 +664,14 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
goto out; goto out;
} }
/* Check to see if the scsi lld put this device into state SDEV_BLOCK. */ /* Check to see if the scsi lld made this device blocked. */
if (unlikely(cmd->device->sdev_state == SDEV_BLOCK)) { if (unlikely(scsi_device_blocked(cmd->device))) {
/* /*
* in SDEV_BLOCK, the command is just put back on the device * in blocked state, the command is just put back on
* queue. The suspend state has already blocked the queue so * the device queue. The suspend state has already
* future requests should not occur until the device * blocked the queue so future requests should not
* transitions out of the suspend state. * occur until the device transitions out of the
* suspend state.
*/ */
scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY); scsi_queue_insert(cmd, SCSI_MLQUEUE_DEVICE_BUSY);

4
drivers/scsi/scsi_scan.c
View File

@ -994,7 +994,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
*/ */
sdev = scsi_device_lookup_by_target(starget, lun); sdev = scsi_device_lookup_by_target(starget, lun);
if (sdev) { if (sdev) {
if (rescan || sdev->sdev_state != SDEV_CREATED) { if (rescan || !scsi_device_created(sdev)) {
SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
"scsi scan: device exists on %s\n", "scsi scan: device exists on %s\n",
sdev->sdev_gendev.bus_id)); sdev->sdev_gendev.bus_id));
@ -1467,7 +1467,7 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
kfree(lun_data); kfree(lun_data);
out: out:
scsi_device_put(sdev); scsi_device_put(sdev);
if (sdev->sdev_state == SDEV_CREATED) if (scsi_device_created(sdev))
/* /*
* the sdev we used didn't appear in the report luns scan * the sdev we used didn't appear in the report luns scan
*/ */

11
include/scsi/scsi_device.h
View File

@ -384,10 +384,21 @@ static inline unsigned int sdev_id(struct scsi_device *sdev)
#define scmd_id(scmd) sdev_id((scmd)->device) #define scmd_id(scmd) sdev_id((scmd)->device)
#define scmd_channel(scmd) sdev_channel((scmd)->device) #define scmd_channel(scmd) sdev_channel((scmd)->device)
/*
* checks for positions of the SCSI state machine
*/
static inline int scsi_device_online(struct scsi_device *sdev) static inline int scsi_device_online(struct scsi_device *sdev)
{ {
return sdev->sdev_state != SDEV_OFFLINE; return sdev->sdev_state != SDEV_OFFLINE;
} }
static inline int scsi_device_blocked(struct scsi_device *sdev)
{
return sdev->sdev_state == SDEV_BLOCK;
}
static inline int scsi_device_created(struct scsi_device *sdev)
{
return sdev->sdev_state == SDEV_CREATED;
}
/* accessor functions for the SCSI parameters */ /* accessor functions for the SCSI parameters */
static inline int scsi_device_sync(struct scsi_device *sdev) static inline int scsi_device_sync(struct scsi_device *sdev)