summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2009-07-15 15:02:57 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-07-30 08:49:59 -0500
commit6187c242089d334102be76427a5a020240e6c19a (patch)
tree0817274791e861500ce50a4107fefd8742501a10 /drivers/scsi
parenta11a52be115889a5d1f738ed2e154807bceed4ee (diff)
downloadlinux-6187c242089d334102be76427a5a020240e6c19a.tar.gz
linux-6187c242089d334102be76427a5a020240e6c19a.tar.bz2
linux-6187c242089d334102be76427a5a020240e6c19a.zip
[SCSI] libiscsi: disable bh in and abort handler.
The session lock can be held in the scsi eh thread or the completion paths run from the net softirq. This disables bhs in iscsi_eh_abort when taking the session lock. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libiscsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 716cc344c5df..a751f6230c22 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1974,10 +1974,10 @@ int iscsi_eh_abort(struct scsi_cmnd *sc)
* good and have never sent us a successful tmf response
* then sent more data for the cmd.
*/
- spin_lock(&session->lock);
+ spin_lock_bh(&session->lock);
fail_scsi_task(task, DID_ABORT);
conn->tmf_state = TMF_INITIAL;
- spin_unlock(&session->lock);
+ spin_unlock_bh(&session->lock);
iscsi_start_tx(conn);
goto success_unlocked;
case TMF_TIMEDOUT: