Commit 64edd55d authored by Anna Schumaker's avatar Anna Schumaker Committed by Trond Myklebust
Browse files

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: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent d5940973

fs/nfs/nfs42xdr.c

+47 −49
Original line number Diff line number Diff line
@@ -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,23 +201,6 @@ 
					 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 + \