3.0-stable patches

added patches:
	sh-fix-fdpic-binary-loader.patch
	tcm_fc-do-not-indicate-retry-capability-to-initiators.patch
	tcm_fc-do-not-report-target-role-when-target-is-not-defined.patch

diff --git a/queue-3.0/series b/queue-3.0/series
new file mode 100644 (file)
index 0000000..bdfcb3e
--- /dev/null
+++ b/queue-3.0/series
@@ -0,0 +1,3 @@
+sh-fix-fdpic-binary-loader.patch
+tcm_fc-do-not-indicate-retry-capability-to-initiators.patch
+tcm_fc-do-not-report-target-role-when-target-is-not-defined.patch

diff --git a/queue-3.0/sh-fix-fdpic-binary-loader.patch b/queue-3.0/sh-fix-fdpic-binary-loader.patch
new file mode 100644 (file)
index 0000000..f55a0ed
--- /dev/null
+++ b/queue-3.0/sh-fix-fdpic-binary-loader.patch
@@ -0,0 +1,35 @@
+From 4a71997a3279a339e7336ea5d0cd27282e2dea44 Mon Sep 17 00:00:00 2001
+From: Thomas Schwinge <thomas@codesourcery.com>
+Date: Fri, 16 Nov 2012 10:46:20 +0100
+Subject: sh: Fix FDPIC binary loader
+
+From: Thomas Schwinge <thomas@codesourcery.com>
+
+commit 4a71997a3279a339e7336ea5d0cd27282e2dea44 upstream.
+
+Ensure that the aux table is properly initialized, even when optional features
+are missing.  Without this, the FDPIC loader did not work.  This was meant to
+be included in commit d5ab780305bb6d60a7b5a74f18cf84eb6ad153b1.
+
+Signed-off-by: Thomas Schwinge <thomas@codesourcery.com>
+Signed-off-by: Paul Mundt <lethal@linux-sh.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/sh/include/asm/elf.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/sh/include/asm/elf.h
++++ b/arch/sh/include/asm/elf.h
+@@ -202,9 +202,9 @@ extern void __kernel_vsyscall;
+       if (vdso_enabled)                                       \
+               NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE);        \
+       else                                                    \
+-              NEW_AUX_ENT(AT_IGNORE, 0);
++              NEW_AUX_ENT(AT_IGNORE, 0)
+ #else
+-#define VSYSCALL_AUX_ENT
++#define VSYSCALL_AUX_ENT      NEW_AUX_ENT(AT_IGNORE, 0)
+ #endif /* CONFIG_VSYSCALL */
+ 
+ #ifdef CONFIG_SH_FPU

diff --git a/queue-3.0/tcm_fc-do-not-indicate-retry-capability-to-initiators.patch b/queue-3.0/tcm_fc-do-not-indicate-retry-capability-to-initiators.patch
new file mode 100644 (file)
index 0000000..5458a86
--- /dev/null
+++ b/queue-3.0/tcm_fc-do-not-indicate-retry-capability-to-initiators.patch
@@ -0,0 +1,36 @@
+From f2eeba214bcd0215b7f558cab6420e5fd153042b Mon Sep 17 00:00:00 2001
+From: Mark Rustad <mark.d.rustad@intel.com>
+Date: Fri, 21 Dec 2012 10:58:14 -0800
+Subject: tcm_fc: Do not indicate retry capability to initiators
+
+From: Mark Rustad <mark.d.rustad@intel.com>
+
+commit f2eeba214bcd0215b7f558cab6420e5fd153042b upstream.
+
+When generating a PRLI response to an initiator, clear the
+FCP_SPPF_RETRY bit in the response.
+
+Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
+Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
+Acked by Robert Love <robert.w.love@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_sess.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/target/tcm_fc/tfc_sess.c
++++ b/drivers/target/tcm_fc/tfc_sess.c
+@@ -434,10 +434,10 @@ static int ft_prli_locked(struct fc_rpor
+ 
+       /*
+        * OR in our service parameters with other provider (initiator), if any.
+-       * TBD XXX - indicate RETRY capability?
+        */
+ fill:
+       fcp_parm = ntohl(spp->spp_params);
++      fcp_parm &= ~FCP_SPPF_RETRY;
+       spp->spp_params = htonl(fcp_parm | FCP_SPPF_TARG_FCN);
+       return FC_SPP_RESP_ACK;
+ }

diff --git a/queue-3.0/tcm_fc-do-not-report-target-role-when-target-is-not-defined.patch b/queue-3.0/tcm_fc-do-not-report-target-role-when-target-is-not-defined.patch
new file mode 100644 (file)
index 0000000..e99f665
--- /dev/null
+++ b/queue-3.0/tcm_fc-do-not-report-target-role-when-target-is-not-defined.patch
@@ -0,0 +1,51 @@
+From edec8dfefa1f372b2dd8197da555352e76a10c03 Mon Sep 17 00:00:00 2001
+From: Mark Rustad <mark.d.rustad@intel.com>
+Date: Fri, 21 Dec 2012 10:58:19 -0800
+Subject: tcm_fc: Do not report target role when target is not defined
+
+From: Mark Rustad <mark.d.rustad@intel.com>
+
+commit edec8dfefa1f372b2dd8197da555352e76a10c03 upstream.
+
+Clear the target role when no target is provided for
+the node performing a PRLI.
+
+Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
+Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
+Acked by Robert Love <robert.w.love@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_sess.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+--- a/drivers/target/tcm_fc/tfc_sess.c
++++ b/drivers/target/tcm_fc/tfc_sess.c
+@@ -393,11 +393,11 @@ static int ft_prli_locked(struct fc_rpor
+ 
+       tport = ft_tport_create(rdata->local_port);
+       if (!tport)
+-              return 0;       /* not a target for this local port */
++              goto not_target;        /* not a target for this local port */
+ 
+       acl = ft_acl_get(tport->tpg, rdata);
+       if (!acl)
+-              return 0;
++              goto not_target;        /* no target for this remote */
+ 
+       if (!rspp)
+               goto fill;
+@@ -440,6 +440,12 @@ fill:
+       fcp_parm &= ~FCP_SPPF_RETRY;
+       spp->spp_params = htonl(fcp_parm | FCP_SPPF_TARG_FCN);
+       return FC_SPP_RESP_ACK;
++
++not_target:
++      fcp_parm = ntohl(spp->spp_params);
++      fcp_parm &= ~FCP_SPPF_TARG_FCN;
++      spp->spp_params = htonl(fcp_parm);
++      return 0;
+ }
+ 
+ /**