From 5c97638bed65fb080d86bea80469f4e8601c77d8 Mon Sep 17 00:00:00 2001 From: "zhenyu.z.wang@intel.com" Date: Fri, 13 Jan 2006 18:05:41 -0600 Subject: [PATCH] --- yaml --- r: 18462 b: refs/heads/master c: 3e97c7e6cda933e3a1b518a8100d155c532a3cfc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/iscsi_tcp.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 117f218f9fe3..a5891d9786a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf310b8f582bddec20c27e32ffbaf8e2c91e147c +refs/heads/master: 3e97c7e6cda933e3a1b518a8100d155c532a3cfc diff --git a/trunk/drivers/scsi/iscsi_tcp.c b/trunk/drivers/scsi/iscsi_tcp.c index 550ff66ba9ec..cd1491e52361 100644 --- a/trunk/drivers/scsi/iscsi_tcp.c +++ b/trunk/drivers/scsi/iscsi_tcp.c @@ -2559,6 +2559,7 @@ iscsi_conn_destroy(iscsi_connh_t connh) { struct iscsi_conn *conn = iscsi_ptr(connh); struct iscsi_session *session = conn->session; + unsigned long flags; mutex_lock(&conn->xmitmutex); set_bit(SUSPEND_BIT, &conn->suspend_tx); @@ -2598,12 +2599,12 @@ iscsi_conn_destroy(iscsi_connh_t connh) * time out or fail. */ for (;;) { - spin_lock_bh(&conn->lock); + spin_lock_irqsave(session->host->host_lock, flags); if (!session->host->host_busy) { /* OK for ERL == 0 */ - spin_unlock_bh(&conn->lock); + spin_unlock_irqrestore(session->host->host_lock, flags); break; } - spin_unlock_bh(&conn->lock); + spin_unlock_irqrestore(session->host->host_lock, flags); msleep_interruptible(500); printk("conn_destroy(): host_busy %d host_failed %d\n", session->host->host_busy, session->host->host_failed);