NFSv4.2: Clean up xattr size macros

Fold them into the other NFS v4.2 operations in the right spots and
adjust spacing to keep the same style.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>

diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 1d74135..215b870 100644 (file)
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -7,6 +7,9 @@
 
 #include "nfs42.h"
 
+/* Not limited by NFS itself, limited by the generic xattr code */
+#define nfs4_xattr_name_maxsz   XDR_QUADLEN(XATTR_NAME_MAX)
+
 #define encode_fallocate_maxsz         (encode_stateid_maxsz + \
                                         2 /* offset */ + \
                                         2 /* length */)
@@ -89,6 +92,18 @@
                                        2 /* dst offset */ + \
                                        2 /* count */)
 #define decode_clone_maxsz             (op_decode_hdr_maxsz)
+#define encode_getxattr_maxsz          (op_encode_hdr_maxsz + 1 + \
+                                        nfs4_xattr_name_maxsz)
+#define decode_getxattr_maxsz          (op_decode_hdr_maxsz + 1 + pagepad_maxsz)
+#define encode_setxattr_maxsz          (op_encode_hdr_maxsz + \
+                                        1 + nfs4_xattr_name_maxsz + 1)
+#define decode_setxattr_maxsz          (op_decode_hdr_maxsz + decode_change_info_maxsz)
+#define encode_listxattrs_maxsz                (op_encode_hdr_maxsz + 2 + 1)
+#define decode_listxattrs_maxsz                (op_decode_hdr_maxsz + 2 + 1 + 1 + 1)
+#define encode_removexattr_maxsz       (op_encode_hdr_maxsz + 1 + \
+                                        nfs4_xattr_name_maxsz)
+#define decode_removexattr_maxsz       (op_decode_hdr_maxsz + \
+                                        decode_change_info_maxsz)
 
 #define NFS4_enc_allocate_sz           (compound_encode_hdr_maxsz + \
                                         encode_sequence_maxsz + \
@@ -186,55 +201,38 @@
                                         decode_putfh_maxsz + \
                                         decode_clone_maxsz + \
                                         decode_getattr_maxsz)
-
-/* Not limited by NFS itself, limited by the generic xattr code */
-#define nfs4_xattr_name_maxsz   XDR_QUADLEN(XATTR_NAME_MAX)
-
-#define encode_getxattr_maxsz   (op_encode_hdr_maxsz + 1 + \
-                                nfs4_xattr_name_maxsz)
-#define decode_getxattr_maxsz   (op_decode_hdr_maxsz + 1 + pagepad_maxsz)
-#define encode_setxattr_maxsz   (op_encode_hdr_maxsz + \
-                                1 + nfs4_xattr_name_maxsz + 1)
-#define decode_setxattr_maxsz   (op_decode_hdr_maxsz + decode_change_info_maxsz)
-#define encode_listxattrs_maxsz  (op_encode_hdr_maxsz + 2 + 1)
-#define decode_listxattrs_maxsz  (op_decode_hdr_maxsz + 2 + 1 + 1 + 1)
-#define encode_removexattr_maxsz (op_encode_hdr_maxsz + 1 + \
-                                 nfs4_xattr_name_maxsz)
-#define decode_removexattr_maxsz (op_decode_hdr_maxsz + \
-                                 decode_change_info_maxsz)
-
-#define NFS4_enc_getxattr_sz   (compound_encode_hdr_maxsz + \
-                               encode_sequence_maxsz + \
-                               encode_putfh_maxsz + \
-                               encode_getxattr_maxsz)
-#define NFS4_dec_getxattr_sz   (compound_decode_hdr_maxsz + \
-                               decode_sequence_maxsz + \
-                               decode_putfh_maxsz + \
-                               decode_getxattr_maxsz)
-#define NFS4_enc_setxattr_sz   (compound_encode_hdr_maxsz + \
-                               encode_sequence_maxsz + \
-                               encode_putfh_maxsz + \
-                               encode_setxattr_maxsz)
-#define NFS4_dec_setxattr_sz   (compound_decode_hdr_maxsz + \
-                               decode_sequence_maxsz + \
-                               decode_putfh_maxsz + \
-                               decode_setxattr_maxsz)
-#define NFS4_enc_listxattrs_sz (compound_encode_hdr_maxsz + \
-                               encode_sequence_maxsz + \
-                               encode_putfh_maxsz + \
-                               encode_listxattrs_maxsz)
-#define NFS4_dec_listxattrs_sz (compound_decode_hdr_maxsz + \
-                               decode_sequence_maxsz + \
-                               decode_putfh_maxsz + \
-                               decode_listxattrs_maxsz)
-#define NFS4_enc_removexattr_sz        (compound_encode_hdr_maxsz + \
-                               encode_sequence_maxsz + \
-                               encode_putfh_maxsz + \
-                               encode_removexattr_maxsz)
-#define NFS4_dec_removexattr_sz        (compound_decode_hdr_maxsz + \
-                               decode_sequence_maxsz + \
-                               decode_putfh_maxsz + \
-                               decode_removexattr_maxsz)
+#define NFS4_enc_getxattr_sz           (compound_encode_hdr_maxsz + \
+                                        encode_sequence_maxsz + \
+                                        encode_putfh_maxsz + \
+                                        encode_getxattr_maxsz)
+#define NFS4_dec_getxattr_sz           (compound_decode_hdr_maxsz + \
+                                        decode_sequence_maxsz + \
+                                        decode_putfh_maxsz + \
+                                        decode_getxattr_maxsz)
+#define NFS4_enc_setxattr_sz           (compound_encode_hdr_maxsz + \
+                                        encode_sequence_maxsz + \
+                                        encode_putfh_maxsz + \
+                                        encode_setxattr_maxsz)
+#define NFS4_dec_setxattr_sz           (compound_decode_hdr_maxsz + \
+                                        decode_sequence_maxsz + \
+                                        decode_putfh_maxsz + \
+                                        decode_setxattr_maxsz)
+#define NFS4_enc_listxattrs_sz         (compound_encode_hdr_maxsz + \
+                                        encode_sequence_maxsz + \
+                                        encode_putfh_maxsz + \
+                                        encode_listxattrs_maxsz)
+#define NFS4_dec_listxattrs_sz         (compound_decode_hdr_maxsz + \
+                                        decode_sequence_maxsz + \
+                                        decode_putfh_maxsz + \
+                                        decode_listxattrs_maxsz)
+#define NFS4_enc_removexattr_sz                (compound_encode_hdr_maxsz + \
+                                        encode_sequence_maxsz + \
+                                        encode_putfh_maxsz + \
+                                        encode_removexattr_maxsz)
+#define NFS4_dec_removexattr_sz                (compound_decode_hdr_maxsz + \
+                                        decode_sequence_maxsz + \
+                                        decode_putfh_maxsz + \
+                                        decode_removexattr_maxsz)
 
 /*
  * These values specify the maximum amount of data that is not