diff options
author | Dan Williams <dan.j.williams@intel.com> | 2012-06-22 02:25:27 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2012-07-20 03:58:45 -0400 |
commit | e4a9c3732cea3e3c8c704aad86636090ffe6b25f (patch) | |
tree | faea8e91b3d917dcdb4c89adbb021ac737a6cb35 /include/scsi/libsas.h | |
parent | 3b661a92e869ebe2358de8f4b3230ad84f7fce51 (diff) |
[SCSI] libata, libsas: introduce sched_eh and end_eh port ops
When managing shost->host_eh_scheduled libata assumes that there is a
1:1 shost-to-ata_port relationship. libsas creates a 1:N relationship
so it needs to manage host_eh_scheduled cumulatively at the host level.
The sched_eh and end_eh port port ops allow libsas to track when domain
devices enter/leave the "eh-pending" state under ha->lock (previously
named ha->state_lock, but it is no longer just a lock for ha->state
changes).
Since host_eh_scheduled indicates eh without backing commands pinning
the device it can be deallocated at any time. Move the taking of the
domain_device reference under the port_lock to guarantee that the
ata_port stays around for the duration of eh.
Reviewed-by: Jacek Danecki <jacek.danecki@intel.com>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r-- | include/scsi/libsas.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 10ce74f589c5..814d8cb592ad 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
@@ -179,6 +179,7 @@ struct sata_device { | |||
179 | enum { | 179 | enum { |
180 | SAS_DEV_GONE, | 180 | SAS_DEV_GONE, |
181 | SAS_DEV_DESTROY, | 181 | SAS_DEV_DESTROY, |
182 | SAS_DEV_EH_PENDING, | ||
182 | }; | 183 | }; |
183 | 184 | ||
184 | struct domain_device { | 185 | struct domain_device { |
@@ -386,7 +387,8 @@ struct sas_ha_struct { | |||
386 | struct list_head defer_q; /* work queued while draining */ | 387 | struct list_head defer_q; /* work queued while draining */ |
387 | struct mutex drain_mutex; | 388 | struct mutex drain_mutex; |
388 | unsigned long state; | 389 | unsigned long state; |
389 | spinlock_t state_lock; | 390 | spinlock_t lock; |
391 | int eh_active; | ||
390 | 392 | ||
391 | struct mutex disco_mutex; | 393 | struct mutex disco_mutex; |
392 | 394 | ||