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

Commit 05a45a2d authored by Jeff Layton's avatar Jeff Layton Committed by J. Bruce Fields
Browse files

sunrpc: turn bitfield flags in svc_version into bools 



It's just simpler to read this way, IMO. Also, no need to explicitly
set vs_hidden to false in the nfsacl ones.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent 4ab495bf

fs/nfs/callback_xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ struct svc_version nfs4_callback_version1 = { 
	.vs_proc = nfs4_callback_procedures1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = 1,

	.vs_hidden = true,

};



struct svc_version nfs4_callback_version4 = {
@@ -1092,5 +1092,5 @@ struct svc_version nfs4_callback_version4 = { 
	.vs_proc = nfs4_callback_procedures1,

	.vs_xdrsize = NFS4_CALLBACK_XDRSIZE,

	.vs_dispatch = NULL,

	.vs_hidden = 1,

	.vs_hidden = true,

};

fs/nfsd/nfs2acl.c

+0 −1
Original line number Diff line number Diff line
@@ -376,5 +376,4 @@ struct svc_version nfsd_acl_version2 = { 
		.vs_proc	= nfsd_acl_procedures2,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

		.vs_hidden	= 0,

};

fs/nfsd/nfs3acl.c

+0 −1
Original line number Diff line number Diff line
@@ -266,6 +266,5 @@ struct svc_version nfsd_acl_version3 = { 
		.vs_proc	= nfsd_acl_procedures3,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS3_SVC_XDRSIZE,

		.vs_hidden	= 0,

};

fs/nfsd/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2542,7 +2542,7 @@ struct svc_version nfsd_version4 = { 
		.vs_proc	= nfsd_procedures4,

		.vs_dispatch	= nfsd_dispatch,

		.vs_xdrsize	= NFS4_SVC_XDRSIZE,

		.vs_rpcb_optnl	= 1,

		.vs_rpcb_optnl	= true,

};



/*

include/linux/sunrpc/svc.h

+5 −4
Original line number Diff line number Diff line
@@ -400,10 +400,11 @@ struct svc_version { 
	struct svc_procedure *	vs_proc;	/* per-procedure info */

	u32			vs_xdrsize;	/* xdrsize needed for this version */



	unsigned int		vs_hidden : 1,	/* Don't register with portmapper.

						 * Only used for nfsacl so far. */

				vs_rpcb_optnl:1;/* Don't care the result of register.

						 * Only used for nfsv4. */

	/* Don't register with rpcbind */

	bool			vs_hidden;



	/* Don't care if the rpcbind registration fails */

	bool			vs_rpcb_optnl;



	/* Override dispatch function (e.g. when caching replies).

	 * A return value of 0 means drop the request.