From a0fdf169ab3c6a9ab1873b1b97c54fe5956a6bfc Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Mon, 16 Jul 2012 11:04:41 -0700
Subject: [PATCH] --- yaml --- r: 312691 b: refs/heads/master c:
 e1013f14376f3121e73917f5455b9b7a22bdfb41 h: refs/heads/master i:   312689:
 f8b70f0a8b445beef0434ea8286e9e0ee88d9701   312687:
 d8f74a32292a54e1d01d74ee632903b09d6609e1 v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/scsi/qla2xxx/qla_target.c | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index 71a645516db4..cc27faa84a6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc187ea6c3b3d20bd190f3ee90c954aee0ce8aad
+refs/heads/master: e1013f14376f3121e73917f5455b9b7a22bdfb41
diff --git a/trunk/drivers/scsi/qla2xxx/qla_target.c b/trunk/drivers/scsi/qla2xxx/qla_target.c
index 87b5a330e0bf..5b30132960c7 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_target.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_target.c
@@ -2643,19 +2643,9 @@ static void qlt_do_work(struct work_struct *work)
 	spin_lock_irqsave(&ha->hardware_lock, flags);
 	sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
 	    atio->u.isp24.fcp_hdr.s_id);
-	if (sess) {
-		if (unlikely(sess->se_sess->sess_tearing_down)) {
-			sess = NULL;
-			spin_unlock_irqrestore(&ha->hardware_lock, flags);
-			goto out_term;
-		} else {
-			/*
-			 * Do the extra kref_get() before dropping
-			 * qla_hw_data->hardware_lock.
-			 */
-			kref_get(&sess->se_sess->sess_kref);
-		}
-	}
+	/* Do kref_get() before dropping qla_hw_data->hardware_lock. */
+	if (sess)
+		kref_get(&sess->se_sess->sess_kref);
 	spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
 	if (unlikely(!sess)) {