drop a nfs patch that didn't build properly.

diff --git a/queue-4.4/nfsd-fix-up-the-supattr_exclcreat-attributes.patch b/queue-4.4/nfsd-fix-up-the-supattr_exclcreat-attributes.patch
deleted file mode 100644 (file)
index 8b0e479..0000000
--- a/queue-4.4/nfsd-fix-up-the-supattr_exclcreat-attributes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b26b78cb726007533d81fdf90a62e915002ef5c8 Mon Sep 17 00:00:00 2001
-From: Trond Myklebust <trond.myklebust@primarydata.com>
-Date: Tue, 9 May 2017 16:24:59 -0400
-Subject: nfsd: Fix up the "supattr_exclcreat" attributes
-
-From: Trond Myklebust <trond.myklebust@primarydata.com>
-
-commit b26b78cb726007533d81fdf90a62e915002ef5c8 upstream.
-
-If an NFSv4 client asks us for the supattr_exclcreat, then we must
-not return attributes that are unsupported by this minor version.
-
-Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-Fixes: 75976de6556f ("NFSD: Return word2 bitmask if setting security..,")
-Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/nfsd/nfs4xdr.c |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -2753,9 +2753,14 @@ out_acl:
-       }
- #endif /* CONFIG_NFSD_PNFS */
-       if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
--              status = nfsd4_encode_bitmap(xdr, NFSD_SUPPATTR_EXCLCREAT_WORD0,
--                                                NFSD_SUPPATTR_EXCLCREAT_WORD1,
--                                                NFSD_SUPPATTR_EXCLCREAT_WORD2);
-+              u32 supp[3];
-+
-+              memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp));
-+              supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0;
-+              supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1;
-+              supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2;
-+
-+              status = nfsd4_encode_bitmap(xdr, supp[0], supp[1], supp[2]);
-               if (status)
-                       goto out;
-       }

diff --git a/queue-4.4/series b/queue-4.4/series
index 71d87fd738511adf91e16c6978edd4d40f7637c5..aeead0d8d36fcfebf373da6c91e8fa82e98b6004 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -101,6 +101,5 @@ pci-freeze-pme-scan-before-suspending-devices.patch
 drm-edid-add-10-bpc-quirk-for-lgd-764-panel-in-hp-zbook-17-g2.patch
 nfsd-check-for-oversized-nfsv2-v3-arguments.patch
 nfsd-encoders-mustn-t-use-unitialized-values-in-error-cases.patch
-nfsd-fix-up-the-supattr_exclcreat-attributes.patch
 drivers-char-mem-check-for-address-space-wraparound-with-mmap.patch
 drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch

diff --git a/queue-4.9/nfsd-fix-up-the-supattr_exclcreat-attributes.patch b/queue-4.9/nfsd-fix-up-the-supattr_exclcreat-attributes.patch
deleted file mode 100644 (file)
index 40817da..0000000
--- a/queue-4.9/nfsd-fix-up-the-supattr_exclcreat-attributes.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From b26b78cb726007533d81fdf90a62e915002ef5c8 Mon Sep 17 00:00:00 2001
-From: Trond Myklebust <trond.myklebust@primarydata.com>
-Date: Tue, 9 May 2017 16:24:59 -0400
-Subject: nfsd: Fix up the "supattr_exclcreat" attributes
-
-From: Trond Myklebust <trond.myklebust@primarydata.com>
-
-commit b26b78cb726007533d81fdf90a62e915002ef5c8 upstream.
-
-If an NFSv4 client asks us for the supattr_exclcreat, then we must
-not return attributes that are unsupported by this minor version.
-
-Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
-Fixes: 75976de6556f ("NFSD: Return word2 bitmask if setting security..,")
-Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- fs/nfsd/nfs4xdr.c |   11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
-
---- a/fs/nfsd/nfs4xdr.c
-+++ b/fs/nfsd/nfs4xdr.c
-@@ -2793,9 +2793,14 @@ out_acl:
-       }
- #endif /* CONFIG_NFSD_PNFS */
-       if (bmval2 & FATTR4_WORD2_SUPPATTR_EXCLCREAT) {
--              status = nfsd4_encode_bitmap(xdr, NFSD_SUPPATTR_EXCLCREAT_WORD0,
--                                                NFSD_SUPPATTR_EXCLCREAT_WORD1,
--                                                NFSD_SUPPATTR_EXCLCREAT_WORD2);
-+              u32 supp[3];
-+
-+              memcpy(supp, nfsd_suppattrs[minorversion], sizeof(supp));
-+              supp[0] &= NFSD_SUPPATTR_EXCLCREAT_WORD0;
-+              supp[1] &= NFSD_SUPPATTR_EXCLCREAT_WORD1;
-+              supp[2] &= NFSD_SUPPATTR_EXCLCREAT_WORD2;
-+
-+              status = nfsd4_encode_bitmap(xdr, supp[0], supp[1], supp[2]);
-               if (status)
-                       goto out;
-       }

diff --git a/queue-4.9/series b/queue-4.9/series
index 21596233007c12ff06699c27f57d669db86a3bda..04997b3c9c876c7c106978ab58224b7d4e825163 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -161,6 +161,5 @@ nfs-fix-use-after-free-in-write-error-path.patch
 nfs-use-gfp_noio-for-two-allocations-in-writeback.patch
 nfsd-fix-undefined-behavior-in-nfsd4_layout_verify.patch
 nfsd-encoders-mustn-t-use-unitialized-values-in-error-cases.patch
-nfsd-fix-up-the-supattr_exclcreat-attributes.patch
 drivers-char-mem-check-for-address-space-wraparound-with-mmap.patch
 drm-i915-gvt-disable-access-to-stolen-memory-as-a-guest.patch