diff options
| author | Dan Williams <[email protected]> | 2012-06-22 06:30:48 +0000 |
|---|---|---|
| committer | James Bottomley <[email protected]> | 2012-07-20 07:58:50 +0000 |
| commit | 5db45bdc87ce4f503947adf7896586d60c63322c (patch) | |
| tree | f939bbcf1e6fc2664c54b46949eb8e5af8aa070b /drivers/scsi/libsas/sas_init.c | |
| parent | [SCSI] cleanup setting task state in scsi_error_handler() (diff) | |
| download | kernel-5db45bdc87ce4f503947adf7896586d60c63322c.tar.gz kernel-5db45bdc87ce4f503947adf7896586d60c63322c.zip | |
[SCSI] libsas: enforce eh strategy handlers only in eh context
The strategy handlers may be called in places that are problematic for
libsas (i.e. sata resets outside of domain revalidation filtering /
libata link recovery), or problematic for userspace (non-blocking ioctl
to sleeping reset functions). However, these routines are also called
for eh escalations and recovery of scsi_eh_prep_cmnd(), so permit them
as long as we are running in the host's error handler, otherwise arrange
for them to be triggered in eh_context.
Signed-off-by: Dan Williams <[email protected]>
Signed-off-by: James Bottomley <[email protected]>
Diffstat (limited to 'drivers/scsi/libsas/sas_init.c')
| -rw-r--r-- | drivers/scsi/libsas/sas_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index 6909fefa32c5..1bbab3d94a20 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c @@ -116,7 +116,9 @@ int sas_register_ha(struct sas_ha_struct *sas_ha) set_bit(SAS_HA_REGISTERED, &sas_ha->state); spin_lock_init(&sas_ha->lock); mutex_init(&sas_ha->drain_mutex); + init_waitqueue_head(&sas_ha->eh_wait_q); INIT_LIST_HEAD(&sas_ha->defer_q); + INIT_LIST_HEAD(&sas_ha->eh_dev_q); error = sas_register_phys(sas_ha); if (error) { |