lockd: Remove unused fields in the nlm_reboot structure (9a38a838) · Commits · 戴 / test

The nlm_reboot structure is used to store information provided by the NSM_NOTIFY procedure. This procedure is not specified by the NLM or NSM protocols, other than to say that the procedure can be used to transmit information private to a particular NLM/NSM implementation. For Linux, the callback arguments include the name of the monitored host, the new NSM state of the host, and a 16-byte private opaque. As a clean up, remove the unused fields and the server-side XDR logic that decodes them. Signed-off-by:

Chuck Lever <chuck.lever@oracle.com> Signed-off-by:

J. Bruce Fields <bfields@citi.umich.edu>

fs/lockd/xdr.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -351,8 +351,6 @@ nlmsvc_decode_reboot(struct svc_rqst rqstp, __be32 p, struct nlm_reboot *argp)
		argp->state = ntohl(*p++);
		/* Preserve the address in network byte order */
		argp->addr = *p++;
		argp->vers = *p++;
		argp->proto = *p++;
		return xdr_argsize_check(rqstp, p);
		}

fs/lockd/xdr4.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -358,8 +358,6 @@ nlm4svc_decode_reboot(struct svc_rqst rqstp, __be32 p, struct nlm_reboot *argp
		argp->state = ntohl(*p++);
		/* Preserve the address in network byte order */
		argp->addr = *p++;
		argp->vers = *p++;
		argp->proto = *p++;
		return xdr_argsize_check(rqstp, p);
		}

include/linux/lockd/xdr.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -81,8 +81,6 @@ struct nlm_reboot {
		unsigned int len;
		u32 state;
		__be32 addr;
		__be32 vers;
		__be32 proto;
		};

		/*

Admin message