From cb7020b6c16228a02da128961deefa68ceb4ed86 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sat, 29 Oct 2005 01:02:43 +0200 Subject: [PATCH] --- yaml --- r: 13909 b: refs/heads/master c: 474838d5e5b5fa768803abc5522ae3fdf85c5f4e h: refs/heads/master i: 13907: 899f5018334cf7af704b396b35c59c00211532e6 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_error.c | 4 ---- trunk/include/scsi/scsi_host.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 6d8e5ea15dff..46736c3ba3c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad42eb1b77b9c17065dc52bcab3f5e1cfb3535b9 +refs/heads/master: 474838d5e5b5fa768803abc5522ae3fdf85c5f4e diff --git a/trunk/drivers/scsi/scsi_error.c b/trunk/drivers/scsi/scsi_error.c index 56353e878130..5a30485d5038 100644 --- a/trunk/drivers/scsi/scsi_error.c +++ b/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 diff --git a/trunk/include/scsi/scsi_host.h b/trunk/include/scsi/scsi_host.h index ecd53d7872d2..9984d3fbb1f0 100644 --- a/trunk/include/scsi/scsi_host.h +++ b/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;