aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/scsi_error.c4
-rw-r--r--include/scsi/scsi_host.h2
2 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c
index 56353e878130..5a30485d5038 100644
--- a/drivers/scsi/scsi_error.c
+++ b/drivers/scsi/scsi_error.c
@@ -1607,8 +1607,6 @@ int scsi_error_handler(void *data)
1607 printk("Error handler scsi_eh_%d waking up\n", 1607 printk("Error handler scsi_eh_%d waking up\n",
1608 shost->host_no)); 1608 shost->host_no));
1609 1609
1610 shost->eh_active = 1;
1611
1612 /* 1610 /*
1613 * We have a host that is failing for some reason. Figure out 1611 * We have a host that is failing for some reason. Figure out
1614 * what we need to do to get it up and online again (if we can). 1612 * what we need to do to get it up and online again (if we can).
@@ -1619,8 +1617,6 @@ int scsi_error_handler(void *data)
1619 else 1617 else
1620 scsi_unjam_host(shost); 1618 scsi_unjam_host(shost);
1621 1619
1622 shost->eh_active = 0;
1623
1624 /* 1620 /*
1625 * Note - if the above fails completely, the action is to take 1621 * Note - if the above fails completely, the action is to take
1626 * individual devices offline and flush the queue of any 1622 * individual devices offline and flush the queue of any
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h
index ecd53d7872d2..9984d3fbb1f0 100644
--- a/include/scsi/scsi_host.h
+++ b/include/scsi/scsi_host.h
@@ -469,8 +469,6 @@ struct Scsi_Host {
469 struct task_struct * ehandler; /* Error recovery thread. */ 469 struct task_struct * ehandler; /* Error recovery thread. */
470 struct semaphore * eh_action; /* Wait for specific actions on the 470 struct semaphore * eh_action; /* Wait for specific actions on the
471 host. */ 471 host. */
472 unsigned int eh_active:1; /* Indicates the eh thread is awake and active if
473 this is true. */
474 wait_queue_head_t host_wait; 472 wait_queue_head_t host_wait;
475 struct scsi_host_template *hostt; 473 struct scsi_host_template *hostt;
476 struct scsi_transport_template *transportt; 474 struct scsi_transport_template *transportt;