aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_error.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/scsi_error.c')
-rw-r--r--drivers/scsi/scsi_error.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 8932ae81a15a..6a014fd15fe9 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -66,7 +66,7 @@ void scsi_eh_wakeup(struct Scsi_Host *shost)
66{ 66{
67 lockdep_assert_held(shost->host_lock); 67 lockdep_assert_held(shost->host_lock);
68 68
69 if (atomic_read(&shost->host_busy) == shost->host_failed) { 69 if (scsi_host_busy(shost) == shost->host_failed) {
70 trace_scsi_eh_wakeup(shost); 70 trace_scsi_eh_wakeup(shost);
71 wake_up_process(shost->ehandler); 71 wake_up_process(shost->ehandler);
72 SCSI_LOG_ERROR_RECOVERY(5, shost_printk(KERN_INFO, shost, 72 SCSI_LOG_ERROR_RECOVERY(5, shost_printk(KERN_INFO, shost,
@@ -2155,7 +2155,7 @@ int scsi_error_handler(void *data)
2155 break; 2155 break;
2156 2156
2157 if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) || 2157 if ((shost->host_failed == 0 && shost->host_eh_scheduled == 0) ||
2158 shost->host_failed != atomic_read(&shost->host_busy)) { 2158 shost->host_failed != scsi_host_busy(shost)) {
2159 SCSI_LOG_ERROR_RECOVERY(1, 2159 SCSI_LOG_ERROR_RECOVERY(1,
2160 shost_printk(KERN_INFO, shost, 2160 shost_printk(KERN_INFO, shost,
2161 "scsi_eh_%d: sleeping\n", 2161 "scsi_eh_%d: sleeping\n",
@@ -2170,7 +2170,7 @@ int scsi_error_handler(void *data)
2170 "scsi_eh_%d: waking up %d/%d/%d\n", 2170 "scsi_eh_%d: waking up %d/%d/%d\n",
2171 shost->host_no, shost->host_eh_scheduled, 2171 shost->host_no, shost->host_eh_scheduled,
2172 shost->host_failed, 2172 shost->host_failed,
2173 atomic_read(&shost->host_busy))); 2173 scsi_host_busy(shost)));
2174 2174
2175 /* 2175 /*
2176 * We have a host that is failing for some reason. Figure out 2176 * We have a host that is failing for some reason. Figure out