Hey Hannes,

I found a couple more places where we should be disabling bottom halves.

1. We should now be disabling them in iscsi_eh_cmd_timed_out because 
dm-mpath can call blk_abort_queue from process context. Previously, it 
could only be called from timer context where the bottom halve for that 
processor is already disabled.

2. iscsi_eh_abort. Not sure what happened, but when I fixed the locking 
in device reset, I thought I fixed it here too, but I guess I did not.

You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To post to this group, send email to open-iscsi@googlegroups.com
To unsubscribe from this group, send email to 
For more options, visit this group at http://groups.google.com/group/open-iscsi

diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index c714bc5..2d37bc4 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -1758,7 +1758,7 @@ static enum blk_eh_timer_return 
iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc)
        ISCSI_DBG_EH(session, "scsi cmd %p timedout\n", sc);
-       spin_lock(&session->lock);
+       spin_lock_bh(&session->lock);
        if (session->state != ISCSI_STATE_LOGGED_IN) {
                 * We are probably in the middle of iscsi recovery so let
@@ -1828,7 +1828,7 @@ static enum blk_eh_timer_return 
iscsi_eh_cmd_timed_out(struct scsi_cmnd *sc)
        if (task)
                task->last_timeout = jiffies;
-       spin_unlock(&session->lock);
+       spin_unlock_bh(&session->lock);
        ISCSI_DBG_EH(session, "return %s\n", rc == BLK_EH_RESET_TIMER ?
                     "timer reset" : "nh");
        return rc;
@@ -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);
                goto success_unlocked;
        case TMF_TIMEDOUT:

Reply via email to