diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-05-28 07:54:40 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-17 13:04:55 -0400 |
commit | 8fa728a26886f56a9ee10a44fea0ddda301d21c3 (patch) | |
tree | 105ead5c90057400abae0c8aa9e2b5ba1818c327 /drivers/scsi/lpfc/lpfc_scsi.c | |
parent | 3471c288036bf0835a82d0b1bbce2002f6e68390 (diff) |
[SCSI] allow sleeping in ->eh_abort_handler()
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 42fab03ad2ba..e9b84f9d8e81 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -798,7 +798,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) | |||
798 | } | 798 | } |
799 | 799 | ||
800 | static int | 800 | static int |
801 | lpfc_abort_handler(struct scsi_cmnd *cmnd) | 801 | __lpfc_abort_handler(struct scsi_cmnd *cmnd) |
802 | { | 802 | { |
803 | struct lpfc_hba *phba = | 803 | struct lpfc_hba *phba = |
804 | (struct lpfc_hba *)cmnd->device->host->hostdata[0]; | 804 | (struct lpfc_hba *)cmnd->device->host->hostdata[0]; |
@@ -918,6 +918,16 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) | |||
918 | } | 918 | } |
919 | 919 | ||
920 | static int | 920 | static int |
921 | lpfc_abort_handler(struct scsi_cmnd *cmnd) | ||
922 | { | ||
923 | int rc; | ||
924 | spin_lock_irq(cmnd->device->host->host_lock); | ||
925 | rc = __lpfc_abort_handler(cmnd); | ||
926 | spin_unlock_irq(cmnd->device->host->host_lock); | ||
927 | return rc; | ||
928 | } | ||
929 | |||
930 | static int | ||
921 | lpfc_reset_lun_handler(struct scsi_cmnd *cmnd) | 931 | lpfc_reset_lun_handler(struct scsi_cmnd *cmnd) |
922 | { | 932 | { |
923 | struct Scsi_Host *shost = cmnd->device->host; | 933 | struct Scsi_Host *shost = cmnd->device->host; |