From d8f74a32292a54e1d01d74ee632903b09d6609e1 Mon Sep 17 00:00:00 2001
From: Roland Dreier <roland@purestorage.com>
Date: Mon, 16 Jul 2012 11:04:36 -0700
Subject: [PATCH] --- yaml --- r: 312687 b: refs/heads/master c:
 b46e34a6721cb057702f19ebe27cfc7877e500e5 h: refs/heads/master i:   312685:
 603cf93cc3f4d0c35c3c3d16750aa9f3ae739ca1   312683:
 103a9e71a406b6ce0ef244ea1826bbe750e4b461   312679:
 936fd4039fb823c40f990375db918a45fcb9e0ea   312671:
 e237d3be57c08b3256210dcdf2926b8cb39dbfb4 v: v3

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

diff --git a/[refs] b/[refs]
index 50b1020eb472..46020f73a10a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 77d4c7450646e6bcba3ff6de17aa4b98c34fe849
+refs/heads/master: b46e34a6721cb057702f19ebe27cfc7877e500e5
diff --git a/trunk/drivers/scsi/qla2xxx/qla_target.c b/trunk/drivers/scsi/qla2xxx/qla_target.c
index 77759c78cc21..87b5a330e0bf 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_target.c
+++ b/trunk/drivers/scsi/qla2xxx/qla_target.c
@@ -2644,7 +2644,7 @@ static void qlt_do_work(struct work_struct *work)
 	sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
 	    atio->u.isp24.fcp_hdr.s_id);
 	if (sess) {
-		if (unlikely(sess->tearing_down)) {
+		if (unlikely(sess->se_sess->sess_tearing_down)) {
 			sess = NULL;
 			spin_unlock_irqrestore(&ha->hardware_lock, flags);
 			goto out_term;
diff --git a/trunk/drivers/scsi/qla2xxx/qla_target.h b/trunk/drivers/scsi/qla2xxx/qla_target.h
index 2953db8b9da0..170af1571214 100644
--- a/trunk/drivers/scsi/qla2xxx/qla_target.h
+++ b/trunk/drivers/scsi/qla2xxx/qla_target.h
@@ -813,7 +813,6 @@ struct qla_tgt_sess {
 	unsigned int conf_compl_supported:1;
 	unsigned int deleted:1;
 	unsigned int local:1;
-	unsigned int tearing_down:1;
 
 	struct se_session *se_sess;
 	struct scsi_qla_host *vha;
diff --git a/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c b/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c
index d85a81776a78..e131d689e573 100644
--- a/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+++ b/trunk/drivers/scsi/qla2xxx/tcm_qla2xxx.c
@@ -464,7 +464,6 @@ static int tcm_qla2xxx_shutdown_session(struct se_session *se_sess)
 	vha = sess->vha;
 
 	spin_lock_irqsave(&vha->hw->hardware_lock, flags);
-	sess->tearing_down = 1;
 	target_splice_sess_cmd_list(se_sess);
 	spin_unlock_irqrestore(&vha->hw->hardware_lock, flags);