Skip to content

Commit

Permalink
libiscsi: fix locking in iscsi_eh_device_reset
Browse files Browse the repository at this point in the history
We must be using the bh spin locking functions in
iscsi_eh_device_reset becuase the session lock interacts with
a thread and softirq.

This patch also fixes up a bogus comment and check in fail_command,
because no one drops the lock (bnx2i did but it is not going
upstream yet and there were other refcount changes for that).

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Mike Christie authored and James Bottomley committed Oct 13, 2008
1 parent 87cd9ea commit a343914
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/scsi/libiscsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -404,11 +404,6 @@ static void fail_command(struct iscsi_conn *conn, struct iscsi_task *task,
conn->session->queued_cmdsn--;
else
conn->session->tt->cleanup_task(conn, task);
/*
* Check if cleanup_task dropped the lock and the command completed,
*/
if (!task->sc)
return;

sc->result = err;
if (!scsi_bidi_cmnd(sc))
Expand Down Expand Up @@ -1829,10 +1824,10 @@ int iscsi_eh_device_reset(struct scsi_cmnd *sc)

iscsi_suspend_tx(conn);

spin_lock(&session->lock);
spin_lock_bh(&session->lock);
fail_all_commands(conn, sc->device->lun, DID_ERROR);
conn->tmf_state = TMF_INITIAL;
spin_unlock(&session->lock);
spin_unlock_bh(&session->lock);

iscsi_start_tx(conn);
goto done;
Expand Down

0 comments on commit a343914

Please sign in to comment.