Commit baadce65 authored by Chuck Lever's avatar Chuck Lever
Browse files

NFSD: Clean up after updating NFSv2 ACL decoders 



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

fs/nfsd/nfsxdr.c

+0 −18
Original line number Diff line number Diff line
@@ -26,18 +26,6 @@ static u32 nfs_ftypes[] = { 
 * Basic NFSv2 data types (RFC 1094 Section 2.3)

 */



static __be32 *

decode_fh(__be32 *p, struct svc_fh *fhp)

{

	fh_init(fhp, NFS_FHSIZE);

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

	fhp->fh_handle.fh_size = NFS_FHSIZE;



	/* FIXME: Look up export pointer here and verify

	 * Sun Secure RPC if requested */

	return p + (NFS_FHSIZE >> 2);

}



/**

 * svcxdr_decode_fhandle - Decode an NFSv2 file handle

 * @xdr: XDR stream positioned at an encoded NFSv2 FH
@@ -62,12 +50,6 @@ svcxdr_decode_fhandle(struct xdr_stream *xdr, struct svc_fh *fhp) 
	return true;

}



/* Helper function for NFSv2 ACL code */

__be32 *nfs2svc_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/xdr.h

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ void nfssvc_release_readres(struct svc_rqst *rqstp); 


/* Helper functions for NFSv2 ACL code */

__be32 *nfs2svc_encode_fattr(struct svc_rqst *rqstp, __be32 *p, struct svc_fh *fhp, struct kstat *stat);

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

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



#endif /* LINUX_NFSD_H */