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/scsi_ioctl.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/scsi_ioctl.c')
| -rw-r--r-- | drivers/scsi/scsi_ioctl.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c index 7a6b530115ac..f5bf5c07be91 100644 --- a/drivers/scsi/scsi_ioctl.c +++ b/drivers/scsi/scsi_ioctl.c | |||
| @@ -475,8 +475,7 @@ int scsi_nonblockable_ioctl(struct scsi_device *sdev, int cmd, | |||
| 475 | * error processing, as long as the device was opened | 475 | * error processing, as long as the device was opened |
| 476 | * non-blocking */ | 476 | * non-blocking */ |
| 477 | if (filp && filp->f_flags & O_NONBLOCK) { | 477 | if (filp && filp->f_flags & O_NONBLOCK) { |
| 478 | if (test_bit(SHOST_RECOVERY, | 478 | if (sdev->host->shost_state == SHOST_RECOVERY) |
| 479 | &sdev->host->shost_state)) | ||
| 480 | return -ENODEV; | 479 | return -ENODEV; |
| 481 | } else if (!scsi_block_when_processing_errors(sdev)) | 480 | } else if (!scsi_block_when_processing_errors(sdev)) |
| 482 | return -ENODEV; | 481 | return -ENODEV; |