---

yaml
---
r: 13909
b: refs/heads/master
c: 474838d
h: refs/heads/master
i:
  13907: 899f501
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad42eb1b77b9c17065dc52bcab3f5e1cfb3535b9
+refs/heads/master: 474838d5e5b5fa768803abc5522ae3fdf85c5f4e

trunk/drivers/scsi/scsi_error.c

@@ -1607,8 +1607,6 @@ int scsi_error_handler(void *data)
 			printk("Error handler scsi_eh_%d waking up\n",
 				shost->host_no));
 
-		shost->eh_active = 1;
-
 		/*
 		 * We have a host that is failing for some reason.  Figure out
 		 * 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)
 		else
 			scsi_unjam_host(shost);
 
-		shost->eh_active = 0;
-
 		/*
 		 * Note - if the above fails completely, the action is to take
 		 * individual devices offline and flush the queue of any

trunk/include/scsi/scsi_host.h

@@ -469,8 +469,6 @@ struct Scsi_Host {
 	struct task_struct    * ehandler;  /* Error recovery thread. */
 	struct semaphore      * eh_action; /* Wait for specific actions on the
                                           host. */
-	unsigned int            eh_active:1; /* Indicates the eh thread is awake and active if
-                                          this is true. */
 	wait_queue_head_t       host_wait;
 	struct scsi_host_template *hostt;
 	struct scsi_transport_template *transportt;