drop nfs patch as it broke the build

diff --git a/queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch b/queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
deleted file mode 100644 (file)
index 21d8001..0000000
--- a/queue-5.4/nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2e577f0faca4640348c398cb85d60a1eedac4b1e Mon Sep 17 00:00:00 2001
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-Date: Wed, 4 Dec 2019 15:13:54 -0500
-Subject: NFSD fixing possible null pointer derefering in copy offload
-
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-
-commit 2e577f0faca4640348c398cb85d60a1eedac4b1e upstream.
-
-Static checker revealed possible error path leading to possible
-NULL pointer dereferencing.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Fixes: e0639dc5805a: ("NFSD introduce async copy feature")
-Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
-Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/nfsd/nfs4proc.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -1223,7 +1223,8 @@ static void cleanup_async_copy(struct nf
- {
-       nfs4_free_cp_state(copy);
-       nfsd_file_put(copy->nf_dst);
--      nfsd_file_put(copy->nf_src);
-+      if (copy->cp_intra)
-+              nfsd_file_put(copy->nf_src);
-       spin_lock(&copy->cp_clp->async_lock);
-       list_del(&copy->copies);
-       spin_unlock(&copy->cp_clp->async_lock);

diff --git a/queue-5.4/series b/queue-5.4/series
index 3c689f2c7a89e2ebf424f41f85ed98c118f05753..211ac97523e8e8e7f27399b9fff2cd54c6849b1c 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -2,4 +2,3 @@ virtio_balloon-adjust-label-in-virtballoon_probe.patch
 alsa-hda-realtek-more-constifications.patch
 alsa-hda-realtek-add-headset-mic-supported-for-hp-cpc.patch
 alsa-hda-realtek-fixed-one-of-hp-alc671-platform-headset-mic-supported.patch
-nfsd-fixing-possible-null-pointer-derefering-in-copy-offload.patch

diff --git a/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy.patch b/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy.patch
deleted file mode 100644 (file)
index 266f587..0000000
--- a/queue-5.5/nfsd-fixing-possible-null-pointer-derefering-in-copy.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a264e7b209f248f59b4fee0d1ed3fbde014a942e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 4 Dec 2019 15:13:54 -0500
-Subject: NFSD fixing possible null pointer derefering in copy offload
-
-From: Olga Kornievskaia <olga.kornievskaia@gmail.com>
-
-[ Upstream commit 2e577f0faca4640348c398cb85d60a1eedac4b1e ]
-
-Static checker revealed possible error path leading to possible
-NULL pointer dereferencing.
-
-Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
-Fixes: e0639dc5805a: ("NFSD introduce async copy feature")
-Signed-off-by: Olga Kornievskaia <kolga@netapp.com>
-Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/nfsd/nfs4proc.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
-index 4798667af647c..91b64c15556e6 100644
---- a/fs/nfsd/nfs4proc.c
-+++ b/fs/nfsd/nfs4proc.c
-@@ -1223,7 +1223,8 @@ static void cleanup_async_copy(struct nfsd4_copy *copy)
- {
-       nfs4_free_cp_state(copy);
-       nfsd_file_put(copy->nf_dst);
--      nfsd_file_put(copy->nf_src);
-+      if (copy->cp_intra)
-+              nfsd_file_put(copy->nf_src);
-       spin_lock(&copy->cp_clp->async_lock);
-       list_del(&copy->copies);
-       spin_unlock(&copy->cp_clp->async_lock);
--- 
-2.20.1
-

diff --git a/queue-5.5/series b/queue-5.5/series
index bc655a1f36ec7ae9184194d644dd8f26b5ce9562..7aea40800de0245b1b3a2a56110dd1694c7a0621 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -2,4 +2,3 @@ virtio_balloon-adjust-label-in-virtballoon_probe.patch
 alsa-hda-realtek-more-constifications.patch
 alsa-hda-realtek-add-headset-mic-supported-for-hp-cp.patch
 alsa-hda-realtek-fixed-one-of-hp-alc671-platform-hea.patch
-nfsd-fixing-possible-null-pointer-derefering-in-copy.patch