Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6187c242 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[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: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a11a52be

drivers/scsi/libiscsi.c

+2 −2
Original line number Diff line number Diff line
@@ -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: