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.
This commit is contained in:
parent
af6665e0aa
commit
c692ea4026
@ -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 *,
|
||||
|
@ -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 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
|
||||
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 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep,
|
||||
*/
|
||||
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 @@ nfsrpc_lock(struct nfsrv_descript *nd, struct nfsmount *nmp, vnode_t vp,
|
||||
*/
|
||||
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;
|
||||
|
@ -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) {
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user