3.10-stable patches

added patches:
	tcm_fc-missing-curly-braces-in-ft_invl_hw_context.patch
	tcm_qla2xxx-fix-incorrect-use-of-__transport_register_session.patch

diff --git a/queue-3.10/series b/queue-3.10/series
index 637e86343a34c6ad4eeb0af134874fbe2f38598c..52feeebde58248daa0db98662064898d5cd9c768 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -9,3 +9,5 @@ asoc-wm8904-fix-wrong-value-references-for-boolean-kctl.patch
 asoc-ak4641-fix-wrong-value-references-for-boolean-kctl.patch
 asoc-adav80x-fix-wrong-value-references-for-boolean-kctl.patch
 asoc-wm8955-fix-wrong-value-references-for-boolean-kctl.patch
+tcm_fc-missing-curly-braces-in-ft_invl_hw_context.patch
+tcm_qla2xxx-fix-incorrect-use-of-__transport_register_session.patch

diff --git a/queue-3.10/tcm_fc-missing-curly-braces-in-ft_invl_hw_context.patch b/queue-3.10/tcm_fc-missing-curly-braces-in-ft_invl_hw_context.patch
new file mode 100644 (file)
index 0000000..e9b4cf1
--- /dev/null
+++ b/queue-3.10/tcm_fc-missing-curly-braces-in-ft_invl_hw_context.patch
@@ -0,0 +1,47 @@
+From d556546e7ecd9fca199df4698943024d40044f8e Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@oracle.com>
+Date: Wed, 25 Feb 2015 16:21:03 +0300
+Subject: tcm_fc: missing curly braces in ft_invl_hw_context()
+
+From: Dan Carpenter <dan.carpenter@oracle.com>
+
+commit d556546e7ecd9fca199df4698943024d40044f8e upstream.
+
+This patch adds a missing set of conditional check braces in
+ft_invl_hw_context() originally introduced by commit dcd998ccd
+when handling DDP failures in ft_recv_write_data() code.
+
+ commit dcd998ccdbf74a7d8fe0f0a44e85da1ed5975946
+ Author: Kiran Patil <kiran.patil@intel.com>
+ Date:   Wed Aug 3 09:20:01 2011 +0000
+
+    tcm_fc: Handle DDP/SW fc_frame_payload_get failures in ft_recv_write_data
+
+Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
+Cc: Kiran Patil <kiran.patil@intel.com>
+Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/target/tcm_fc/tfc_io.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/target/tcm_fc/tfc_io.c
++++ b/drivers/target/tcm_fc/tfc_io.c
+@@ -346,7 +346,7 @@ void ft_invl_hw_context(struct ft_cmd *c
+               ep = fc_seq_exch(seq);
+               if (ep) {
+                       lport = ep->lp;
+-                      if (lport && (ep->xid <= lport->lro_xid))
++                      if (lport && (ep->xid <= lport->lro_xid)) {
+                               /*
+                                * "ddp_done" trigger invalidation of HW
+                                * specific DDP context
+@@ -361,6 +361,7 @@ void ft_invl_hw_context(struct ft_cmd *c
+                                * identified using ep->xid)
+                                */
+                               cmd->was_ddp_setup = 0;
++                      }
+               }
+       }
+ }

diff --git a/queue-3.10/tcm_qla2xxx-fix-incorrect-use-of-__transport_register_session.patch b/queue-3.10/tcm_qla2xxx-fix-incorrect-use-of-__transport_register_session.patch
new file mode 100644 (file)
index 0000000..0195ca4
--- /dev/null
+++ b/queue-3.10/tcm_qla2xxx-fix-incorrect-use-of-__transport_register_session.patch
@@ -0,0 +1,39 @@
+From 75c3d0bf9caebb502e96683b2bc37f9692437e68 Mon Sep 17 00:00:00 2001
+From: Bart Van Assche <bart.vanassche@sandisk.com>
+Date: Thu, 19 Mar 2015 22:25:16 -0700
+Subject: tcm_qla2xxx: Fix incorrect use of __transport_register_session
+
+From: Bart Van Assche <bart.vanassche@sandisk.com>
+
+commit 75c3d0bf9caebb502e96683b2bc37f9692437e68 upstream.
+
+This patch fixes the incorrect use of __transport_register_session()
+in tcm_qla2xxx_check_initiator_node_acl() code, that does not perform
+explicit se_tpg->session_lock when accessing se_tpg->tpg_sess_list
+to add new se_sess nodes.
+
+Given that tcm_qla2xxx_check_initiator_node_acl() is not called with
+qla_hw->hardware_lock held for all accesses of ->tpg_sess_list, the
+code should be using transport_register_session() instead.
+
+Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
+Cc: Giridhar Malavali <giridhar.malavali@qlogic.com>
+Cc: Quinn Tran <quinn.tran@qlogic.com>
+Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/qla2xxx/tcm_qla2xxx.c
++++ b/drivers/scsi/qla2xxx/tcm_qla2xxx.c
+@@ -1465,7 +1465,7 @@ static int tcm_qla2xxx_check_initiator_n
+       /*
+        * Finally register the new FC Nexus with TCM
+        */
+-      __transport_register_session(se_nacl->se_tpg, se_nacl, se_sess, sess);
++      transport_register_session(se_nacl->se_tpg, se_nacl, se_sess, sess);
+ 
+       return 0;
+ }