Commit 1adf0c5a authored Jun 15, 2016 by Andrew Elble Committed by J. Bruce Fields Jul 13, 2016

nfs/nfsd: Move useful bitfield ops to a commonly accessible place



So these may be used in nfsd as well

Signed-off-by: Andrew Elble <aweits@rit.edu>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent d8d29138

include/linux/nfs4.h

+11 −0

Original line number	Diff line number	Diff line
		@@ -643,4 +643,15 @@ enum pnfs_update_layout_reason {
		PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET,
		};

		#define NFS4_OP_MAP_NUM_LONGS \
		DIV_ROUND_UP(LAST_NFS4_OP, 8 * sizeof(unsigned long))
		#define NFS4_OP_MAP_NUM_WORDS \
		(NFS4_OP_MAP_NUM_LONGS * sizeof(unsigned long) / sizeof(u32))
		struct nfs4_op_map {
		union {
		unsigned long longs[NFS4_OP_MAP_NUM_LONGS];
		u32 words[NFS4_OP_MAP_NUM_WORDS];
		} u;
		};

		#endif

include/linux/nfs_xdr.h

+0 −11

Original line number	Diff line number	Diff line
		@@ -1185,17 +1185,6 @@ struct pnfs_ds_commit_info {
		struct pnfs_commit_bucket *buckets;
		};

		#define NFS4_OP_MAP_NUM_LONGS \
		DIV_ROUND_UP(LAST_NFS4_OP, 8 * sizeof(unsigned long))
		#define NFS4_OP_MAP_NUM_WORDS \
		(NFS4_OP_MAP_NUM_LONGS * sizeof(unsigned long) / sizeof(u32))
		struct nfs4_op_map {
		union {
		unsigned long longs[NFS4_OP_MAP_NUM_LONGS];
		u32 words[NFS4_OP_MAP_NUM_WORDS];
		} u;
		};

		struct nfs41_state_protection {
		u32 how;
		struct nfs4_op_map enforce;