Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ca277d8 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Shrink the struct nfs_fattr 



We don't need the bitmap[] field anymore, since the 'valid' field tells us
all we need to know about which attributes were filled in...
Also move the pre-op attributes in order to improve the structure packing.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 9e6e70f8

fs/nfs/nfs4xdr.c

+0 −3
Original line number Diff line number Diff line
@@ -3002,9 +3002,6 @@ static int decode_getfattr(struct xdr_stream *xdr, struct nfs_fattr *fattr, cons 
	if ((status = decode_attr_bitmap(xdr, bitmap)) != 0)

		goto xdr_error;



	fattr->bitmap[0] = bitmap[0];

	fattr->bitmap[1] = bitmap[1];



	if ((status = decode_attr_length(xdr, &attrlen, &savep)) != 0)

		goto xdr_error;

include/linux/nfs_xdr.h

+3 −4
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ static inline int nfs_fsid_equal(const struct nfs_fsid *a, const struct nfs_fsid 


struct nfs_fattr {

	unsigned int		valid;		/* which fields are valid */

	__u64			pre_size;	/* pre_op_attr.size	  */

	struct timespec		pre_mtime;	/* pre_op_attr.mtime	  */

	struct timespec		pre_ctime;	/* pre_op_attr.ctime	  */

	enum nfs_ftype		type;		/* always use NFSv2 types */

	__u32			mode;

	__u32			nlink;
@@ -52,9 +49,11 @@ struct nfs_fattr { 
	struct timespec		atime;

	struct timespec		mtime;

	struct timespec		ctime;

	__u32			bitmap[2];	/* NFSv4 returned attribute bitmap */

	__u64			change_attr;	/* NFSv4 change attribute */

	__u64			pre_change_attr;/* pre-op NFSv4 change attribute */

	__u64			pre_size;	/* pre_op_attr.size	  */

	struct timespec		pre_mtime;	/* pre_op_attr.mtime	  */

	struct timespec		pre_ctime;	/* pre_op_attr.ctime	  */

	unsigned long		time_start;

	unsigned long		gencount;

};