Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.com>2019-05-03 16:48:09 +1000
committerNeilBrown <neilb@suse.com>2019-05-03 16:48:09 +1000
commit3673108c567e6ef572eb5e802c4108e107a64c97 (patch)
treef75aada18c03be1657503e7cc3ffb702551b9187
parent83ebe4a0475a5557ff51d172fa23010a4770edcd (diff)
NFS: Add missing encode / decode sequence_maxsz to v4.2
operations (git-fixes).
-rw-r--r--patches.fixes/NFS-Add-missing-encode-decode-sequence_maxsz-to-v4.2.patch75
-rw-r--r--series.conf1
2 files changed, 76 insertions, 0 deletions
diff --git a/patches.fixes/NFS-Add-missing-encode-decode-sequence_maxsz-to-v4.2.patch b/patches.fixes/NFS-Add-missing-encode-decode-sequence_maxsz-to-v4.2.patch
new file mode 100644
index 0000000000..a450858e73
--- /dev/null
+++ b/patches.fixes/NFS-Add-missing-encode-decode-sequence_maxsz-to-v4.2.patch
@@ -0,0 +1,75 @@
+From: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Date: Fri, 1 Mar 2019 16:09:56 -0500
+Subject: [PATCH] NFS: Add missing encode / decode sequence_maxsz to v4.2
+ operations
+Git-commit: 1a3466aed3a17eed41cd9411f89eb637f58349b0
+Patch-mainline: v5.1
+References: git-fixes
+
+These really should have been there from the beginning, but we never
+noticed because there was enough slack in the RPC request for the extra
+bytes. Chuck's recent patch to use au_cslack and au_rslack to compute
+buffer size shrunk the buffer enough that this was now a problem for
+SEEK operations on my test client.
+
+Fixes: f4ac1674f5da4 ("nfs: Add ALLOCATE support")
+Fixes: 2e72448b07dc3 ("NFS: Add COPY nfs operation")
+Fixes: cb95deea0b4aa ("NFS OFFLOAD_CANCEL xdr")
+Fixes: 624bd5b7b683c ("nfs: Add DEALLOCATE support")
+Fixes: 1c6dcbe5ceff8 ("NFS: Implement SEEK")
+Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
+Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
+Acked-by: NeilBrown <neilb@suse.com>
+
+---
+ fs/nfs/nfs42xdr.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/fs/nfs/nfs42xdr.c
++++ b/fs/nfs/nfs42xdr.c
+@@ -55,37 +55,45 @@
+ #define decode_clone_maxsz (op_decode_hdr_maxsz)
+
+ #define NFS4_enc_allocate_sz (compound_encode_hdr_maxsz + \
++ encode_sequence_maxsz + \
+ encode_putfh_maxsz + \
+ encode_allocate_maxsz + \
+ encode_getattr_maxsz)
+ #define NFS4_dec_allocate_sz (compound_decode_hdr_maxsz + \
++ decode_sequence_maxsz + \
+ decode_putfh_maxsz + \
+ decode_allocate_maxsz + \
+ decode_getattr_maxsz)
+ #define NFS4_enc_copy_sz (compound_encode_hdr_maxsz + \
++ encode_sequence_maxsz + \
+ encode_putfh_maxsz + \
+ encode_savefh_maxsz + \
+ encode_putfh_maxsz + \
+ encode_copy_maxsz + \
+ encode_commit_maxsz)
+ #define NFS4_dec_copy_sz (compound_decode_hdr_maxsz + \
++ decode_sequence_maxsz + \
+ decode_putfh_maxsz + \
+ decode_savefh_maxsz + \
+ decode_putfh_maxsz + \
+ decode_copy_maxsz + \
+ decode_commit_maxsz)
+ #define NFS4_enc_deallocate_sz (compound_encode_hdr_maxsz + \
++ encode_sequence_maxsz + \
+ encode_putfh_maxsz + \
+ encode_deallocate_maxsz + \
+ encode_getattr_maxsz)
+ #define NFS4_dec_deallocate_sz (compound_decode_hdr_maxsz + \
++ decode_sequence_maxsz + \
+ decode_putfh_maxsz + \
+ decode_deallocate_maxsz + \
+ decode_getattr_maxsz)
+ #define NFS4_enc_seek_sz (compound_encode_hdr_maxsz + \
++ encode_sequence_maxsz + \
+ encode_putfh_maxsz + \
+ encode_seek_maxsz)
+ #define NFS4_dec_seek_sz (compound_decode_hdr_maxsz + \
++ decode_sequence_maxsz + \
+ decode_putfh_maxsz + \
+ decode_seek_maxsz)
+ #define NFS4_enc_layoutstats_sz (compound_encode_hdr_maxsz + \
diff --git a/series.conf b/series.conf
index d8b41587b9..5035ee855e 100644
--- a/series.conf
+++ b/series.conf
@@ -21301,6 +21301,7 @@
patches.fixes/NFS-Fix-a-soft-lockup-in-the-delegation-recovery-cod.patch
patches.fixes/NFS-pnfs-Bulk-destroy-of-layouts-needs-to-be-safe-w..patch
patches.fixes/NFSv4.1-Reinitialise-sequence-results-before-retrans.patch
+ patches.fixes/NFS-Add-missing-encode-decode-sequence_maxsz-to-v4.2.patch
patches.fixes/NFSv4-flexfiles-Fix-invalid-deref-in-FF_LAYOUT_DEVID.patch
patches.suse/Btrfs-fix-corruption-reading-shared-and-compressed-e.patch
patches.suse/btrfs-fix-deadlock-between-clone-dedupe-and-rename.patch