Commit 9cee763e authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Clean up after updating NFSv3 ACL decoders 



Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 68519ff2

fs/nfsd/nfs3xdr.c

+0 −20
Original line number Diff line number Diff line
@@ -82,26 +82,6 @@ svcxdr_decode_nfs_fh3(struct xdr_stream *xdr, struct svc_fh *fhp) 
	return true;

}



static __be32 *

decode_fh(__be32 *p, struct svc_fh *fhp)

{

	unsigned int size;

	fh_init(fhp, NFS3_FHSIZE);

	size = ntohl(*p++);

	if (size > NFS3_FHSIZE)

		return NULL;



	memcpy(&fhp->fh_handle.fh_base, p, size);

	fhp->fh_handle.fh_size = size;

	return p + XDR_QUADLEN(size);

}



/* Helper function for NFSv3 ACL code */

__be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp)

{

	return decode_fh(p, fhp);

}



static __be32 *

encode_fh(__be32 *p, struct svc_fh *fhp)

{

fs/nfsd/xdr3.h

+0 −2
Original line number Diff line number Diff line
@@ -307,8 +307,6 @@ int nfs3svc_encode_entry_plus(void *, const char *name, 
/* Helper functions for NFSv3 ACL code */

__be32 *nfs3svc_encode_post_op_attr(struct svc_rqst *rqstp, __be32 *p,

				struct svc_fh *fhp);

__be32 *nfs3svc_decode_fh(__be32 *p, struct svc_fh *fhp);

bool svcxdr_decode_nfs_fh3(struct xdr_stream *xdr, struct svc_fh *fhp);





#endif /* _LINUX_NFSD_XDR3_H */