diff options
| author | Mike Christie <michaelc@cs.wisc.edu> | 2010-12-31 02:22:21 -0600 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-31 09:52:44 -0600 |
| commit | f41d472179a0d7c8e8160c85180ab1124947068e (patch) | |
| tree | 51f3397de8fc8acf3c27d08c2e39e2eb39bacc75 /include/scsi | |
| parent | 1227633a441363642cdbaf38c4241d071e917095 (diff) | |
| download | linux-stable-f41d472179a0d7c8e8160c85180ab1124947068e.tar.gz linux-stable-f41d472179a0d7c8e8160c85180ab1124947068e.tar.bz2 linux-stable-f41d472179a0d7c8e8160c85180ab1124947068e.zip | |
[SCSI] libiscsi: do not take host lock in queuecommand
iscsi_tcp, ib_iser, cxgb*, be2iscsi and bnx2i do not use
the host lock and do not take the session lock against
a irq, so this patch drops the DEF_SCSI_QCMD use. Instead
we just take the session lock and disable bhs.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'include/scsi')
| -rw-r--r-- | include/scsi/libiscsi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/libiscsi.h b/include/scsi/libiscsi.h index 68e951d79f0b..748382b32b52 100644 --- a/include/scsi/libiscsi.h +++ b/include/scsi/libiscsi.h @@ -89,6 +89,7 @@ enum { ISCSI_TASK_RUNNING, ISCSI_TASK_ABRT_TMF, /* aborted due to TMF */ ISCSI_TASK_ABRT_SESS_RECOV, /* aborted due to session recovery */ + ISCSI_TASK_REQUEUE_SCSIQ, /* qcmd requeueing to scsi-ml */ }; struct iscsi_r2t_info { @@ -341,7 +342,7 @@ extern int iscsi_eh_abort(struct scsi_cmnd *sc); extern int iscsi_eh_recover_target(struct scsi_cmnd *sc); extern int iscsi_eh_session_reset(struct scsi_cmnd *sc); extern int iscsi_eh_device_reset(struct scsi_cmnd *sc); -extern int iscsi_queuecommand(struct Scsi_Host *h, struct scsi_cmnd *sc); +extern int iscsi_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *sc); /* * iSCSI host helpers. |