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

NFSD: Move the fh_getattr() helper 



Clean up: The fh_getattr() function is part of NFSD's file handle
API, so relocate it.

I've made it an un-inlined function so that trace points and new
functionality can easily be introduced. That increases the size of
nfsd.ko by about a page on my x86_64 system (out of 26MB; compiled
with -O2).

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent c926f029

fs/nfsd/nfsfh.c

+23 −0
Original line number Diff line number Diff line
@@ -662,6 +662,29 @@ fh_update(struct svc_fh *fhp) 
	return nfserr_serverfault;

}



/**

 * fh_getattr - Retrieve attributes on a local file

 * @fhp: File handle of target file

 * @stat: Caller-supplied kstat buffer to be filled in

 *

 * Returns nfs_ok on success, otherwise an NFS status code is

 * returned.

 */

__be32 fh_getattr(const struct svc_fh *fhp, struct kstat *stat)

{

	struct path p = {

		.mnt		= fhp->fh_export->ex_path.mnt,

		.dentry		= fhp->fh_dentry,

	};

	u32 request_mask = STATX_BASIC_STATS;



	if (fhp->fh_maxsize == NFS4_FHSIZE)

		request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE);



	return nfserrno(vfs_getattr(&p, stat, request_mask,

				    AT_STATX_SYNC_AS_STAT));

}



/**

 * fh_fill_pre_attrs - Fill in pre-op attributes

 * @fhp: file handle to be updated

fs/nfsd/nfsfh.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ extern char * SVCFH_fmt(struct svc_fh *fhp); 
__be32	fh_verify(struct svc_rqst *, struct svc_fh *, umode_t, int);

__be32	fh_verify_local(struct net *, struct svc_cred *, struct auth_domain *,

			struct svc_fh *, umode_t, int);

__be32	fh_getattr(const struct svc_fh *fhp, struct kstat *stat);

__be32	fh_compose(struct svc_fh *, struct svc_export *, struct dentry *, struct svc_fh *);

__be32	fh_update(struct svc_fh *);

void	fh_put(struct svc_fh *);

fs/nfsd/vfs.h

+0 −13
Original line number Diff line number Diff line
@@ -160,17 +160,4 @@ __be32 nfsd_permission(struct svc_cred *cred, struct svc_export *exp, 


void		nfsd_filp_close(struct file *fp);



static inline __be32 fh_getattr(const struct svc_fh *fh, struct kstat *stat)

{

	u32 request_mask = STATX_BASIC_STATS;

	struct path p = {.mnt = fh->fh_export->ex_path.mnt,

			 .dentry = fh->fh_dentry};



	if (fh->fh_maxsize == NFS4_FHSIZE)

		request_mask |= (STATX_BTIME | STATX_CHANGE_COOKIE);



	return nfserrno(vfs_getattr(&p, stat, request_mask,

				    AT_STATX_SYNC_AS_STAT));

}



#endif /* LINUX_NFSD_VFS_H */