system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-07 09:00:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nfscl: Clean up the code by removing unused arguments

Browse source 
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:
Rick Macklem 2022-06-13 15:57:42 -07:00
parent 1a2ff852e3
commit 41c029d506
3 changed files with 16 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sys/fs/nfs/nfs_var.h
View file

@ -443,7 +443,7 @@ int nfsrpc_null(vnode_t, struct ucred *, NFSPROC_T *);
int nfsrpc_access(vnode_t, int, struct ucred *, NFSPROC_T *,
struct nfsvattr *, int *);
int nfsrpc_accessrpc(vnode_t, u_int32_t, struct ucred *,
NFSPROC_T *, struct nfsvattr *, int *, u_int32_t *, void *);
NFSPROC_T *, struct nfsvattr *, int *, u_int32_t *);
int nfsrpc_open(vnode_t, int, struct ucred *, NFSPROC_T *);
int nfsrpc_openrpc(struct nfsmount *, vnode_t, u_int8_t *, int, u_int8_t *, int,
u_int32_t, struct nfsclopen *, u_int8_t *, int, struct nfscldeleg **, int,
@ -457,12 +457,11 @@ int nfsrpc_openconfirm(vnode_t, u_int8_t *, int, struct nfsclopen *,
struct ucred *, NFSPROC_T *);
int nfsrpc_setclient(struct nfsmount *, struct nfsclclient *, int,
bool *, struct ucred *, NFSPROC_T *);
int nfsrpc_getattr(vnode_t, struct ucred *, NFSPROC_T *,
struct nfsvattr *, void *);
int nfsrpc_getattr(vnode_t, struct ucred *, NFSPROC_T *, struct nfsvattr *);
int nfsrpc_getattrnovp(struct nfsmount *, u_int8_t *, int, int,
struct ucred *, NFSPROC_T *, struct nfsvattr *, u_int64_t *, uint32_t *);
int nfsrpc_setattr(vnode_t, struct vattr *, NFSACL_T *, struct ucred *,
NFSPROC_T *, struct nfsvattr *, int *, void *);
NFSPROC_T *, struct nfsvattr *, int *);
int nfsrpc_lookup(vnode_t, char *, int, struct ucred *, NFSPROC_T *,
struct nfsvattr *, struct nfsvattr *, struct nfsfh **, int *, int *,
void *, uint32_t);

13
sys/fs/nfsclient/nfs_clrpcops.c
View file

@ -281,8 +281,7 @@ nfsrpc_access(vnode_t vp, int acmode, struct ucred *cred,
/*
* Now, just call nfsrpc_accessrpc() to do the actual RPC.
*/
error = nfsrpc_accessrpc(vp, mode, cred, p, nap, attrflagp, &rmode,
NULL);
error = nfsrpc_accessrpc(vp, mode, cred, p, nap, attrflagp, &rmode);
/*
* The NFS V3 spec does not clarify whether or not
@ -299,8 +298,7 @@ nfsrpc_access(vnode_t vp, int acmode, struct ucred *cred,
*/
int
nfsrpc_accessrpc(vnode_t vp, u_int32_t mode, struct ucred *cred,
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, u_int32_t *rmodep,
void *stuff)
NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, u_int32_t *rmodep)
{
u_int32_t *tl;
u_int32_t supported, rmode;
@ -1204,7 +1202,7 @@ nfsrpc_setclient(struct nfsmount *nmp, struct nfsclclient *clp, int reclaim,
*/
int
nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
struct nfsvattr *nap, void *stuff)
struct nfsvattr *nap)
{
struct nfsrv_descript nfsd, *nd = &nfsd;
int error;
@ -1271,8 +1269,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred,
*/
int
nfsrpc_setattr(vnode_t vp, struct vattr *vap, NFSACL_T *aclp,
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *rnap, int *attrflagp,
void *stuff)
struct ucred *cred, NFSPROC_T *p, struct nfsvattr *rnap, int *attrflagp)
{
int error, expireret = 0, openerr, retrycnt;
u_int32_t clidrev = 0, mode;
@ -5036,7 +5033,7 @@ nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p,
if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp))
return (EOPNOTSUPP);
error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL, stuff);
error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL);
return (error);
}

19
sys/fs/nfsclient/nfs_clvnops.c
View file

@ -407,7 +407,7 @@ nfs34_access_otw(struct vnode *vp, int wmode, struct thread *td,
struct nfsvattr nfsva;
error = nfsrpc_accessrpc(vp, wmode, cred, td, &nfsva, &attrflag,
&rmode, NULL);
&rmode);
if (attrflag)
(void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1);
if (!error) {
@ -948,8 +948,7 @@ nfs_close(struct vop_close_args *ap)
if (error == 0 && nfscl_mustflush(vp) != 0 &&
vp->v_type == VREG &&
(VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOCTO) == 0) {
ret = nfsrpc_getattr(vp, cred, ap->a_td, &nfsva,
NULL);
ret = nfsrpc_getattr(vp, cred, ap->a_td, &nfsva);
if (!ret) {
np->n_change = nfsva.na_filerev;
(void) nfscl_loadattrcache(&vp, &nfsva, NULL,
@ -1029,7 +1028,7 @@ nfs_getattr(struct vop_getattr_args *ap)
return (0);
}
}
error = nfsrpc_getattr(vp, ap->a_cred, td, &nfsva, NULL);
error = nfsrpc_getattr(vp, ap->a_cred, td, &nfsva);
if (!error)
error = nfscl_loadattrcache(&vp, &nfsva, vap, 0, 0);
if (!error) {
@ -1186,8 +1185,7 @@ nfs_setattrrpc(struct vnode *vp, struct vattr *vap, struct ucred *cred,
NFSUNLOCKNODE(np);
KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp);
}
error = nfsrpc_setattr(vp, vap, NULL, cred, td, &nfsva, &attrflag,
NULL);
error = nfsrpc_setattr(vp, vap, NULL, cred, td, &nfsva, &attrflag);
if (attrflag) {
ret = nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1);
if (ret && !error)
@ -1806,8 +1804,8 @@ nfs_create(struct vop_create_args *ap)
if (!error) {
newvp = NFSTOV(np);
if (attrflag == 0)
error = nfsrpc_getattr(newvp, cnp->cn_cred,
curthread, &nfsva, NULL);
error = nfsrpc_getattr(newvp, cnp->cn_cred, curthread,
&nfsva);
if (error == 0)
error = nfscl_loadattrcache(&newvp, &nfsva, NULL, 0, 1);
}
@ -1824,15 +1822,14 @@ nfs_create(struct vop_create_args *ap)
} else if (NFS_ISV34(dvp) && (fmode & O_EXCL)) {
if (nfscl_checksattr(vap, &nfsva)) {
error = nfsrpc_setattr(newvp, vap, NULL, cnp->cn_cred,
curthread, &nfsva, &attrflag, NULL);
curthread, &nfsva, &attrflag);
if (error && (vap->va_uid != (uid_t)VNOVAL ||
vap->va_gid != (gid_t)VNOVAL)) {
/* try again without setting uid/gid */
vap->va_uid = (uid_t)VNOVAL;
vap->va_gid = (uid_t)VNOVAL;
error = nfsrpc_setattr(newvp, vap, NULL,
cnp->cn_cred, curthread, &nfsva,
&attrflag, NULL);
cnp->cn_cred, curthread, &nfsva, &attrflag);
}
if (attrflag)
(void) nfscl_loadattrcache(&newvp, &nfsva, NULL,