lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge HEAD from ../scsi-misc-2.6-tmp

Browse Source
This commit is contained in:
James Bottomley
2005-08-28 11:18:35 -05:00
parent 392160335c 8224bfa84d
commit 7a93aef7fb
72 changed files with 3837 additions and 8035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/scsi/scsi_lib.c
View File

@@ -400,7 +400,7 @@ void scsi_device_unbusy(struct scsi_device *sdev)
spin_lock_irqsave(shost->host_lock, flags);
shost->host_busy--;
if (unlikely(test_bit(SHOST_RECOVERY, &shost->shost_state) &&
if (unlikely((shost->shost_state == SHOST_RECOVERY) &&
shost->host_failed))
scsi_eh_wakeup(shost);
spin_unlock(shost->host_lock);
@@ -1281,7 +1281,7 @@ static inline int scsi_host_queue_ready(struct request_queue *q,
struct Scsi_Host *shost,
struct scsi_device *sdev)
{
if (test_bit(SHOST_RECOVERY, &shost->shost_state))
if (shost->shost_state == SHOST_RECOVERY)
return 0;
if (shost->host_busy == 0 && shost->host_blocked) {
/*