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

[SCSI] libiscsi: use bh locking instead of irq with session lock 



The session lock is taken in threads, timers, and bottom halves
like softirqs and tasklets. All the code but
iscsi_conn/session_failure take the session lock with the spin_lock_bh
call. This was done because I thought some offload drivers
would be calling these functions from a irq. They never did,
so this patch has iscsi_conn/session_failure use the bh
locking.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent f41d4721

drivers/scsi/libiscsi.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -1338,17 +1338,16 @@ void iscsi_session_failure(struct iscsi_session *session, 
{

{

	struct iscsi_conn *conn;

	struct iscsi_conn *conn;

	struct device *dev;

	struct device *dev;

	unsigned long flags;





	spin_lock_irqsave(&session->lock, flags);

	spin_lock_bh(&session->lock);

	conn = session->leadconn;

	conn = session->leadconn;

	if (session->state == ISCSI_STATE_TERMINATE || !conn) {

	if (session->state == ISCSI_STATE_TERMINATE || !conn) {

		spin_unlock_irqrestore(&session->lock, flags);

		spin_unlock_bh(&session->lock);

		return;

		return;

	}

	}





	dev = get_device(&conn->cls_conn->dev);

	dev = get_device(&conn->cls_conn->dev);

	spin_unlock_irqrestore(&session->lock, flags);

	spin_unlock_bh(&session->lock);

	if (!dev)

	if (!dev)

	        return;

	        return;

	/*

	/*
@@ -1367,17 +1366,16 @@ EXPORT_SYMBOL_GPL(iscsi_session_failure); 
void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)

void iscsi_conn_failure(struct iscsi_conn *conn, enum iscsi_err err)

{

{

	struct iscsi_session *session = conn->session;

	struct iscsi_session *session = conn->session;

	unsigned long flags;





	spin_lock_irqsave(&session->lock, flags);

	spin_lock_bh(&session->lock);

	if (session->state == ISCSI_STATE_FAILED) {

	if (session->state == ISCSI_STATE_FAILED) {

		spin_unlock_irqrestore(&session->lock, flags);

		spin_unlock_bh(&session->lock);

		return;

		return;

	}

	}





	if (conn->stop_stage == 0)

	if (conn->stop_stage == 0)

		session->state = ISCSI_STATE_FAILED;

		session->state = ISCSI_STATE_FAILED;

	spin_unlock_irqrestore(&session->lock, flags);

	spin_unlock_bh(&session->lock);





	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx);

	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);

	set_bit(ISCSI_SUSPEND_BIT, &conn->suspend_rx);

CRA Git | Maintained and supported by SUSTech CRA and CCSE