diff options
| author | Mike Anderson <andmike@us.ibm.com> | 2005-06-16 14:12:38 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-07-30 12:10:24 -0400 |
| commit | d3301874083874f8a0ac88aa1bb7da6b62df34d2 (patch) | |
| tree | ceb564fe0a965588f14b441ef0dc93b36953b6b2 /drivers/scsi/sg.c | |
| parent | 5dbffcd83d826a9b42a10afb89b13156dc5b9539 (diff) | |
[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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index 51292f269ce5..14fb179b3842 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -1027,8 +1027,7 @@ sg_ioctl(struct inode *inode, struct file *filp, | |||
| 1027 | if (sdp->detached) | 1027 | if (sdp->detached) |
| 1028 | return -ENODEV; | 1028 | return -ENODEV; |
| 1029 | if (filp->f_flags & O_NONBLOCK) { | 1029 | if (filp->f_flags & O_NONBLOCK) { |
| 1030 | if (test_bit(SHOST_RECOVERY, | 1030 | if (sdp->device->host->shost_state == SHOST_RECOVERY) |
| 1031 | &sdp->device->host->shost_state)) | ||
| 1032 | return -EBUSY; | 1031 | return -EBUSY; |
| 1033 | } else if (!scsi_block_when_processing_errors(sdp->device)) | 1032 | } else if (!scsi_block_when_processing_errors(sdp->device)) |
| 1034 | return -EBUSY; | 1033 | return -EBUSY; |