Date: Thu, 16 Jun 2022 23:47:26 GMT From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: c692ea402659 - main - nfscl: Clean up the code by removing unused arguments Message-ID: <202206162347.25GNlQT3003038@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=c692ea4026598b6869393c8379ba941348e74cbe commit c692ea4026598b6869393c8379ba941348e74cbe Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2022-06-16 23:46:06 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2022-06-16 23:46:06 +0000 nfscl: Clean up the code by removing unused arguments The "void *stuff" (also called fstuff and dstuff) argument was used by the Mac OSX port. For FreeBSD, this argument is always NULL, so remove it to clean up the code. This commit gets rid of "stuff" for assorted functions defined in nfs_clrpcops.c and called in nfs_clvnops.c. Future commits will do the same for other functions. This commit should not result in a semantics change. --- sys/fs/nfs/nfs_var.h | 8 ++++---- sys/fs/nfsclient/nfs_clrpcops.c | 9 ++++----- sys/fs/nfsclient/nfs_clvfsops.c | 2 +- sys/fs/nfsclient/nfs_clvnops.c | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index d7bbf6558453..990a017ce372 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -494,11 +494,11 @@ int nfsrpc_mkdir(vnode_t, char *, int, struct vattr *, int nfsrpc_rmdir(vnode_t, char *, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_readdir(vnode_t, struct uio *, nfsuint64 *, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, int *, void *); + NFSPROC_T *, struct nfsvattr *, int *, int *); int nfsrpc_readdirplus(vnode_t, struct uio *, nfsuint64 *, - struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int *, void *); + struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int *); int nfsrpc_commit(vnode_t, u_quad_t, int, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, void *); + NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_advlock(vnode_t, off_t, int, struct flock *, int, struct ucred *, NFSPROC_T *, void *, int); int nfsrpc_lockt(struct nfsrv_descript *, vnode_t, @@ -508,7 +508,7 @@ int nfsrpc_lock(struct nfsrv_descript *, struct nfsmount *, vnode_t, u_int8_t *, int, struct nfscllockowner *, int, int, u_int64_t, u_int64_t, short, struct ucred *, NFSPROC_T *, int); int nfsrpc_statfs(vnode_t, struct nfsstatfs *, struct nfsfsinfo *, - struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *); + struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_fsinfo(vnode_t, struct nfsfsinfo *, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *); int nfsrpc_pathconf(vnode_t, struct nfsv3_pathconf *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 972a7edd9e31..347d81667e19 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -3210,7 +3210,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred, int nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, - int *eofp, void *stuff) + int *eofp) { int len, left; struct dirent *dp = NULL; @@ -3654,7 +3654,7 @@ nfsmout: int nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, - int *eofp, void *stuff) + int *eofp) { int len, left; struct dirent *dp = NULL; @@ -4188,7 +4188,7 @@ nfsmout: */ int nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, struct ucred *cred, - NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, void *stuff) + NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp) { u_int32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -4620,8 +4620,7 @@ nfsmout: */ int nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, - struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, - void *stuff) + struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp) { u_int32_t *tl = NULL; struct nfsrv_descript nfsd, *nd = &nfsd; diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 31490c3db51d..343272db31fa 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -316,7 +316,7 @@ nfs_statfs(struct mount *mp, struct statfs *sbp) mtx_unlock(&nmp->nm_mtx); if (!error) error = nfsrpc_statfs(vp, &sb, &fs, td->td_ucred, td, &nfsva, - &attrflag, NULL); + &attrflag); if (error != 0) NFSCL_DEBUG(2, "statfs=%d\n", error); if (attrflag == 0) { diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 5191cc27b77a..2e3cab0799ec 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2536,7 +2536,7 @@ ncl_readdirrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred, (void)ncl_fsinfo(nmp, vp, cred, td); error = nfsrpc_readdir(vp, uiop, &cookie, cred, td, &nfsva, - &attrflag, &eof, NULL); + &attrflag, &eof); if (attrflag) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); @@ -2599,7 +2599,7 @@ ncl_readdirplusrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred, if (NFSHASNFSV3(nmp) && !NFSHASGOTFSINFO(nmp)) (void)ncl_fsinfo(nmp, vp, cred, td); error = nfsrpc_readdirplus(vp, uiop, &cookie, cred, td, &nfsva, - &attrflag, &eof, NULL); + &attrflag, &eof); if (attrflag) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); @@ -2845,7 +2845,7 @@ ncl_commit(struct vnode *vp, u_quad_t offset, int cnt, struct ucred *cred, } mtx_unlock(&nmp->nm_mtx); error = nfsrpc_commit(vp, offset, cnt, cred, td, &nfsva, - &attrflag, NULL); + &attrflag); } if (attrflag != 0) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206162347.25GNlQT3003038>