3.7: added needed iscsi patch

diff --git a/review-3.7/iscsi-target-fix-cmdsn-comparison-use-cmd-cmd_sn-instead-of-cmd-stat_sn.patch b/review-3.7/iscsi-target-fix-cmdsn-comparison-use-cmd-cmd_sn-instead-of-cmd-stat_sn.patch
new file mode 100644 (file)
index 0000000..d0e8466
--- /dev/null
+++ b/review-3.7/iscsi-target-fix-cmdsn-comparison-use-cmd-cmd_sn-instead-of-cmd-stat_sn.patch
@@ -0,0 +1,34 @@
+From 64fe4f4f181cc2fe97d4176bf6ee6e3725ae33ec Mon Sep 17 00:00:00 2001
+From: Roland Dreier <roland@purestorage.com>
+Date: Mon, 7 Jan 2013 11:45:16 -0800
+Subject: iscsi-target: Fix CmdSN comparison (use cmd->cmd_sn instead of cmd->stat_sn)
+
+From: Roland Dreier <roland@purestorage.com>
+
+commit 64fe4f4f181cc2fe97d4176bf6ee6e3725ae33ec upstream.
+
+Commit 64c13330a389 ("iscsi-target: Fix bug in handling of ExpStatSN
+ACK during u32 wrap-around") introduced a bug where we compare the
+wrong SN against our ExpCmdSN.
+
+Reported-by: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Roland Dreier <roland@purestorage.com>
+Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
+Cc: Ben Hutchings <ben@decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/target/iscsi/iscsi_target_erl2.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/target/iscsi/iscsi_target_erl2.c
++++ b/drivers/target/iscsi/iscsi_target_erl2.c
+@@ -372,7 +372,7 @@ int iscsit_prepare_cmds_for_realligance(
+                * made generic here.
+                */
+               if (!(cmd->cmd_flags & ICF_OOO_CMDSN) && !cmd->immediate_cmd &&
+-                   iscsi_sna_gte(cmd->stat_sn, conn->sess->exp_cmd_sn)) {
++                   iscsi_sna_gte(cmd->cmd_sn, conn->sess->exp_cmd_sn)) {
+                       list_del(&cmd->i_conn_node);
+                       spin_unlock_bh(&conn->cmd_lock);
+                       iscsit_free_cmd(cmd);

diff --git a/review-3.7/series b/review-3.7/series
index d7dc46851923ea259ac14cd255faa9210a115a8a..19025f3d66a80771da88a769d6c738fc5e46637b 100644 (file)
--- a/review-3.7/series
+++ b/review-3.7/series
@@ -120,6 +120,7 @@ acpi-do-not-use-lid-and-sleep-button-for-s5-wakeup.patch
 regmap-debugfs-avoid-overflows-for-very-small-reads.patch
 epoll-prevent-missed-events-on-epoll_ctl_mod.patch
 hid-add-quirk-for-freescale-i.mx23-rom-recovery.patch
+iscsi-target-fix-cmdsn-comparison-use-cmd-cmd_sn-instead-of-cmd-stat_sn.patch
 asoc-arizona-correct-fll-source-definitions.patch
 asoc-arizona-do-proper-shift-for-setting-aif-rate.patch
 asoc-arizona-remove-dsp-b-and-left-justified-aif-modes.patch