From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 20 Mar 2014 04:55:07 +0000 (-0700)
Subject: 3.4-stable patches
X-Git-Tag: v3.4.84~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0721e083028804fd8ea26372673bdcc37028dff;p=thirdparty%2Fkernel%2Fstable-queue.git

3.4-stable patches

added patches:
	libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8-2ba30001.patch
	nfs-fix-a-delegation-callback-race.patch
---

diff --git a/queue-3.4/libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8-2ba30001.patch b/queue-3.4/libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8-2ba30001.patch
new file mode 100644
index 00000000000..1c104c295dd
--- /dev/null
+++ b/queue-3.4/libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8-2ba30001.patch
@@ -0,0 +1,36 @@
+From b28a613e9138e4b3a64649bd60b13436f4b4b49b Mon Sep 17 00:00:00 2001
+From: Michele Baldessari <michele@acksyn.org>
+Date: Fri, 7 Mar 2014 16:34:29 +0000
+Subject: libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus SpinPoint M8 (2BA30001)
+
+From: Michele Baldessari <michele@acksyn.org>
+
+commit b28a613e9138e4b3a64649bd60b13436f4b4b49b upstream.
+
+Via commit 87809942d3fa "libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk
+for Seagate Momentus SpinPoint M8" we added a quirk for disks named
+"ST1000LM024 HN-M101MBB" with firmware revision "2AR10001".
+
+As reported on https://bugzilla.redhat.com/show_bug.cgi?id=1073901,
+we need to also add firmware revision 2BA30001 as it is broken as well.
+
+Reported-by: Nicholas <arealityfarbetween@googlemail.com>
+Signed-off-by: Michele Baldessari <michele@acksyn.org>
+Tested-by: Guilherme Amadio <guilherme.amadio@gmail.com>
+Signed-off-by: Tejun Heo <tj@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/ata/libata-core.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/ata/libata-core.c
++++ b/drivers/ata/libata-core.c
+@@ -4106,6 +4106,7 @@ static const struct ata_blacklist_entry
+ 
+ 	/* Seagate Momentus SpinPoint M8 seem to have FPMDA_AA issues */
+ 	{ "ST1000LM024 HN-M101MBB", "2AR10001",	ATA_HORKAGE_BROKEN_FPDMA_AA },
++	{ "ST1000LM024 HN-M101MBB", "2BA30001",	ATA_HORKAGE_BROKEN_FPDMA_AA },
+ 
+ 	/* Blacklist entries taken from Silicon Image 3124/3132
+ 	   Windows driver .inf file - also several Linux problem reports */
diff --git a/queue-3.4/nfs-fix-a-delegation-callback-race.patch b/queue-3.4/nfs-fix-a-delegation-callback-race.patch
new file mode 100644
index 00000000000..ad8476a7ae3
--- /dev/null
+++ b/queue-3.4/nfs-fix-a-delegation-callback-race.patch
@@ -0,0 +1,49 @@
+From 755a48a7a4eb05b9c8424e3017d947b2961a60e0 Mon Sep 17 00:00:00 2001
+From: Trond Myklebust <trond.myklebust@primarydata.com>
+Date: Sun, 2 Mar 2014 22:03:12 -0500
+Subject: NFS: Fix a delegation callback race
+
+From: Trond Myklebust <trond.myklebust@primarydata.com>
+
+commit 755a48a7a4eb05b9c8424e3017d947b2961a60e0 upstream.
+
+The clean-up in commit 36281caa839f ended up removing a NULL pointer check
+that is needed in order to prevent an Oops in
+nfs_async_inode_return_delegation().
+
+Reported-by: "Yan, Zheng" <zheng.z.yan@intel.com>
+Link: http://lkml.kernel.org/r/5313E9F6.2020405@intel.com
+Fixes: 36281caa839f (NFSv4: Further clean-ups of delegation stateid validation)
+Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/nfs/delegation.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/fs/nfs/delegation.c
++++ b/fs/nfs/delegation.c
+@@ -540,16 +540,19 @@ int nfs_async_inode_return_delegation(st
+ 
+ 	rcu_read_lock();
+ 	delegation = rcu_dereference(NFS_I(inode)->delegation);
++	if (delegation == NULL)
++		goto out_enoent;
+ 
+-	if (!clp->cl_mvops->match_stateid(&delegation->stateid, stateid)) {
+-		rcu_read_unlock();
+-		return -ENOENT;
+-	}
++	if (!clp->cl_mvops->match_stateid(&delegation->stateid, stateid))
++		goto out_enoent;
+ 	nfs_mark_return_delegation(server, delegation);
+ 	rcu_read_unlock();
+ 
+ 	nfs_delegation_run_state_manager(clp);
+ 	return 0;
++out_enoent:
++	rcu_read_unlock();
++	return -ENOENT;
+ }
+ 
+ static struct inode *
diff --git a/queue-3.4/series b/queue-3.4/series
index 87aec2bdeca..e410ef34285 100644
--- a/queue-3.4/series
+++ b/queue-3.4/series
@@ -20,3 +20,5 @@ cpuset-fix-a-race-condition-in-__cpuset_node_allowed_softwall.patch
 tracing-do-not-add-event-files-for-modules-that-fail-tracepoints.patch
 firewire-net-fix-use-after-free.patch
 firewire-don-t-use-prepare_delayed_work.patch
+libata-add-ata_horkage_broken_fpdma_aa-quirk-for-seagate-momentus-spinpoint-m8-2ba30001.patch
+nfs-fix-a-delegation-callback-race.patch