summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sg.c
diff options
context:
space:
mode:
authorMike Anderson <andmike@us.ibm.com>2005-06-16 11:12:38 -0700
committerJames Bottomley <jejb@mulgrave.(none)>2005-07-30 11:10:24 -0500
commitd3301874083874f8a0ac88aa1bb7da6b62df34d2 (patch)
treeceb564fe0a965588f14b441ef0dc93b36953b6b2 /drivers/scsi/sg.c
parent5dbffcd83d826a9b42a10afb89b13156dc5b9539 (diff)
downloadop-kernel-dev-d3301874083874f8a0ac88aa1bb7da6b62df34d2.zip
op-kernel-dev-d3301874083874f8a0ac88aa1bb7da6b62df34d2.tar.gz
[SCSI] host state model update: replace old host bitmap state
Migrate the current SCSI host state model to a model like SCSI device is using. Signed-off-by: Mike Anderson <andmike@us.ibm.com> Rejections fixed up and Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sg.c')
-rw-r--r--drivers/scsi/sg.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 51292f2..14fb179 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1027,8 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp,
if (sdp->detached)
return -ENODEV;
if (filp->f_flags & O_NONBLOCK) {
- if (test_bit(SHOST_RECOVERY,
- &sdp->device->host->shost_state))
+ if (sdp->device->host->shost_state == SHOST_RECOVERY)
return -EBUSY;
} else if (!scsi_block_when_processing_errors(sdp->device))
return -EBUSY;
OpenPOWER on IntegriCloud