[kernel/f20] Add patch to fix nfsd soft lockup (rhbz 1185519)

[Josh Boyer]

commit 15a883b0e74ce4e13916ca4322909b100ccdba56
Author: Josh Boyer <jwboyer at fedoraproject.org>
Date:   Mon Mar 2 14:17:35 2015 -0500

    Add patch to fix nfsd soft lockup (rhbz 1185519)

 ...-cl_revoked-list-deletion-causing-softloc.patch | 35 ++++++++++++++++++++++
 kernel.spec                                        |  7 +++++
 2 files changed, 42 insertions(+)
---
diff --git a/NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch b/NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch
new file mode 100644
index 0000000..a7067ff
--- /dev/null
+++ b/NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch
@@ -0,0 +1,35 @@
+From: Andrew Elble <aweits at rit.edu>
+Date: Wed, 25 Feb 2015 13:42:55 -0500
+Subject: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in
+ nfsd
+
+commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is
+protected by clp->cl_lock") removed the use of the reaplist to
+clean out clp->cl_revoked. It failed to change list_entry() to
+walk clp->cl_revoked.next instead of reaplist.next
+
+Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock")
+Cc: stable at vger.kernel.org
+Reported-by: Eric Meddaugh <etmsys at rit.edu>
+Tested-by: Eric Meddaugh <etmsys at rit.edu>
+Signed-off-by: Andrew Elble <aweits at rit.edu>
+---
+ fs/nfsd/nfs4state.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
+index d66e3ad1de48..5c9c13ee72f9 100644
+--- a/fs/nfsd/nfs4state.c
++++ b/fs/nfsd/nfs4state.c
+@@ -1650,7 +1650,7 @@ __destroy_client(struct nfs4_client *clp)
+ 		nfs4_put_stid(&dp->dl_stid);
+ 	}
+ 	while (!list_empty(&clp->cl_revoked)) {
+-		dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);
++		dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru);
+ 		list_del_init(&dp->dl_recall_lru);
+ 		nfs4_put_stid(&dp->dl_stid);
+ 	}
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index 274d0ec..9b0a58b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -761,6 +761,9 @@ Patch26135: ASLR-fix-stack-randomization-on-64-bit-systems.patch
 #CVE-XXXX-XXXX rhbz 1189864 1192079
 Patch26136: vhost-scsi-potential-memory-corruption.patch
 
+#rhbz 1185519
+Patch26142: NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch
+
 #CVE-2015-0275 rhbz 1193907 1195178
 Patch26138: ext4-Allocate-entire-range-in-zero-range.patch
 
@@ -1503,6 +1506,9 @@ ApplyPatch HID-i2c-hid-Limit-reads-to-wMaxInputLength-bytes-for.patch
 #rhbz 1190947
 ApplyPatch Bluetooth-ath3k-Add-support-Atheros-AR5B195-combo-Mi.patch
 
+#rhbz 1185519
+ApplyPatch NFS-fix-clp-cl_revoked-list-deletion-causing-softloc.patch
+
 %if 0%{?aarch64patches}
 ApplyPatch kernel-arm64.patch
 %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2322,6 +2328,7 @@ fi
 #                 ||     ||
 %changelog
 * Mon Mar 02 2015 Josh Boyer <jwboyer at fedoraproject.org>
+- Add patch to fix nfsd soft lockup (rhbz 1185519)
 - Enable ET131X driver (rhbz 1197842)
 
 * Sat Feb 28 2015 Peter Robinson <pbrobinson at fedoraproject.org>