Date: Sun, 10 Apr 2022 21:08:23 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: 5580e5bd7160 - main - nfscl: Clean up the code by removing unused arguments Message-ID: <202204102108.23AL8N1J081857@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=5580e5bd7160d9168cc2fc75d415f48ae6963c7e commit 5580e5bd7160d9168cc2fc75d415f48ae6963c7e Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2022-04-10 21:05:44 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2022-04-10 21:05:44 +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 nfscl_request(). Future commits will do the same for other functions. --- sys/fs/nfs/nfs_var.h | 2 +- sys/fs/nfsclient/nfs_clport.c | 2 +- sys/fs/nfsclient/nfs_clrpcops.c | 84 ++++++++++++++++++++--------------------- 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 8feb900af67e..8e7ac67fdf6a 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -378,7 +378,7 @@ int nfscl_wcc_data(struct nfsrv_descript *, vnode_t, struct nfsvattr *, int *, int *, uint64_t *); int nfsm_loadattr(struct nfsrv_descript *, struct nfsvattr *); int nfscl_request(struct nfsrv_descript *, vnode_t, - NFSPROC_T *, struct ucred *, void *); + NFSPROC_T *, struct ucred *); /* nfs_nfsdsubs.c */ void nfsd_fhtovp(struct nfsrv_descript *, struct nfsrvfh *, int, diff --git a/sys/fs/nfsclient/nfs_clport.c b/sys/fs/nfsclient/nfs_clport.c index 34f83b09d9e9..59083035aa4f 100644 --- a/sys/fs/nfsclient/nfs_clport.c +++ b/sys/fs/nfsclient/nfs_clport.c @@ -882,7 +882,7 @@ nfsmout: */ int nfscl_request(struct nfsrv_descript *nd, struct vnode *vp, NFSPROC_T *p, - struct ucred *cred, void *stuff) + struct ucred *cred) { int ret, vers; struct nfsmount *nmp; diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 25890b7c8699..a89b5ac0e4f5 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -242,7 +242,7 @@ nfsrpc_null(vnode_t vp, struct ucred *cred, NFSPROC_T *p) struct nfsrv_descript nfsd, *nd = &nfsd; NFSCL_REQSTART(nd, NFSPROC_NULL, vp); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (nd->nd_repstat && !error) error = nd->nd_repstat; m_freem(nd->nd_mrep); @@ -322,7 +322,7 @@ nfsrpc_accessrpc(vnode_t vp, u_int32_t mode, struct ucred *cred, NFSGETATTR_ATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV3) { @@ -719,7 +719,7 @@ nfsrpc_opendowngrade(vnode_t vp, u_int32_t mode, struct nfsclopen *op, *tl++ = txdr_unsigned(op->nfso_own->nfsow_seqid); *tl++ = txdr_unsigned(mode & NFSV4OPEN_ACCESSBOTH); *tl = txdr_unsigned((mode >> NFSLCK_SHIFT) & NFSV4OPEN_DENYBOTH); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); NFSCL_INCRSEQID(op->nfso_own->nfsow_seqid, nd); @@ -925,7 +925,7 @@ nfsrpc_openconfirm(vnode_t vp, u_int8_t *nfhp, int fhlen, *tl++ = op->nfso_stateid.other[1]; *tl++ = op->nfso_stateid.other[2]; *tl = txdr_unsigned(op->nfso_own->nfsow_seqid); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); NFSCL_INCRSEQID(op->nfso_own->nfsow_seqid, nd); @@ -1211,7 +1211,7 @@ nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSGETATTR_ATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (!nd->nd_repstat) @@ -1374,7 +1374,7 @@ nfsrpc_setattrrpc(vnode_t vp, struct vattr *vap, NFSGETATTR_ATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) @@ -1474,7 +1474,7 @@ nfsrpc_lookup(vnode_t dvp, char *name, int len, struct ucred *cred, *tl = txdr_unsigned(NFSV4OPEN_CLAIMFH); } } - error = nfscl_request(nd, dvp, p, cred, stuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); ndp = NULL; @@ -1654,7 +1654,7 @@ nfsrpc_readlink(vnode_t vp, struct uio *uiop, struct ucred *cred, NFSGETATTR_ATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV3) @@ -1797,7 +1797,7 @@ nfsrpc_readrpc(vnode_t vp, struct uio *uiop, struct ucred *cred, * doesn't seem any point in doing one here, either. * (See the comment in nfsrpc_writerpc() for more info.) */ - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV3) { @@ -2018,7 +2018,7 @@ nfsrpc_writerpc(vnode_t vp, struct uio *uiop, int *iomode, *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_repstat) { @@ -2195,7 +2195,7 @@ nfsrpc_deallocaterpc(vnode_t vp, off_t offs, off_t len, NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); wccflag = 0; @@ -2272,7 +2272,7 @@ nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap, } if (nd->nd_flag & ND_NFSV2) nfscl_fillsattr(nd, vap, dvp, NFSSATTR_SIZERDEV, rdev); - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV4) @@ -2404,7 +2404,7 @@ nfsrpc_createv23(vnode_t dvp, char *name, int namelen, struct vattr *vap, } else { nfscl_fillsattr(nd, vap, dvp, NFSSATTR_SIZE0, 0); } - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); if (nd->nd_repstat == 0) { @@ -2506,7 +2506,7 @@ nfsrpc_createv4(vnode_t dvp, char *name, int namelen, struct vattr *vap, NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED); *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); NFSCL_INCRSEQID(owp->nfsow_seqid, nd); @@ -2714,7 +2714,7 @@ tryagain: if (ret == 0) NFSCL_REQSTART(nd, NFSPROC_REMOVE, dvp); (void) nfsm_strtom(nd, name, namelen); - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) { @@ -2842,7 +2842,7 @@ tryagain: (void) nfsm_fhtom(nd, VTONFS(tdvp)->n_fhp->nfh_fh, VTONFS(tdvp)->n_fhp->nfh_len, 0); (void) nfsm_strtom(nd, tnameptr, tnamelen); - error = nfscl_request(nd, fdvp, p, cred, fstuff); + error = nfscl_request(nd, fdvp, p, cred); if (error) return (error); if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) { @@ -2936,7 +2936,7 @@ nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, *tl = txdr_unsigned(NFSV4OP_LINK); } (void) nfsm_strtom(nd, name, namelen); - error = nfscl_request(nd, vp, p, cred, dstuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV3) { @@ -2999,7 +2999,7 @@ nfsrpc_symlink(vnode_t dvp, char *name, int namelen, const char *target, (void) nfsm_strtom(nd, target, slen); if (nd->nd_flag & ND_NFSV2) nfscl_fillsattr(nd, vap, dvp, NFSSATTR_SIZENEG1, 0); - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV4) @@ -3069,7 +3069,7 @@ nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap, *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV4) @@ -3123,7 +3123,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred, return (ENAMETOOLONG); NFSCL_REQSTART(nd, NFSPROC_RMDIR, dvp); (void) nfsm_strtom(nd, name, namelen); - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error) return (error); if (nd->nd_flag & (ND_NFSV3 | ND_NFSV4)) @@ -3243,7 +3243,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, *tl++ = txdr_unsigned(NFSV4OP_GETFH); *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); dotfileid = 0; /* Fake out the compiler. */ @@ -3384,7 +3384,7 @@ nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, *tl = txdr_unsigned(readsize); } } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (!(nd->nd_flag & ND_NFSV2)) { @@ -3685,7 +3685,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, *tl++ = txdr_unsigned(NFSV4OP_GETFH); *tl = txdr_unsigned(NFSV4OP_GETATTR); (void) nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); dotfileid = 0; /* Fake out the compiler. */ @@ -3824,7 +3824,7 @@ nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, (void) nfsrv_putattrbit(nd, &dattrbits); } nanouptime(&ts); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV3) @@ -4171,7 +4171,7 @@ nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, struct ucred *cred, NFSGETATTR_ATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); } - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); error = nfscl_wcc_data(nd, vp, nap, attrflagp, NULL, NULL); @@ -4395,7 +4395,7 @@ nfsrpc_lockt(struct nfsrv_descript *nd, vnode_t vp, NFSBCOPY(np->n_fhp->nfh_fh, &own[NFSV4CL_LOCKNAMELEN], np->n_fhp->nfh_len); (void)nfsm_strtom(nd, own, NFSV4CL_LOCKNAMELEN + np->n_fhp->nfh_len); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_repstat == 0) { @@ -4599,7 +4599,7 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, NFSSTATFS_GETATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); nd->nd_flag |= ND_USEGSSNAME; - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_repstat == 0) { @@ -4619,7 +4619,7 @@ nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, goto nfsmout; } else { NFSCL_REQSTART(nd, NFSPROC_FSSTAT, vp); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_flag & ND_NFSV3) { @@ -4678,7 +4678,7 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc, NFSPATHCONF_GETATTRBIT(&attrbits); (void) nfsrv_putattrbit(nd, &attrbits); nd->nd_flag |= ND_USEGSSNAME; - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (nd->nd_repstat == 0) { @@ -4692,7 +4692,7 @@ nfsrpc_pathconf(vnode_t vp, struct nfsv3_pathconf *pc, } } else { NFSCL_REQSTART(nd, NFSPROC_PATHCONF, vp); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); error = nfscl_postop_attr(nd, nap, attrflagp); @@ -4728,7 +4728,7 @@ nfsrpc_fsinfo(vnode_t vp, struct nfsfsinfo *fsp, struct ucred *cred, *attrflagp = 0; NFSCL_REQSTART(nd, NFSPROC_FSINFO, vp); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); error = nfscl_postop_attr(nd, nap, attrflagp); @@ -4967,7 +4967,7 @@ nfsrpc_getacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); if (!nd->nd_repstat) @@ -5015,7 +5015,7 @@ nfsrpc_setaclrpc(vnode_t vp, struct ucred *cred, NFSPROC_T *p, NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_ACL); (void) nfsv4_fillattr(nd, vp->v_mount, vp, aclp, NULL, NULL, 0, &attrbits, NULL, NULL, 0, 0, 0, 0, (uint64_t)0, NULL); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error) return (error); /* Don't care about the pre/postop attributes */ @@ -7217,7 +7217,7 @@ nfsrpc_advise(vnode_t vp, off_t offset, uint64_t cnt, int advise, tl += 2; txdr_hyper(cnt, tl); nfsrv_putattrbit(nd, &hints); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); if (nd->nd_repstat != 0) @@ -7429,7 +7429,7 @@ nfsrpc_allocaterpc(vnode_t vp, off_t off, off_t len, nfsv4stateid_t *stateidp, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, stuff); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); if (nd->nd_repstat == 0) { @@ -8148,7 +8148,7 @@ nfsrpc_createlayout(vnode_t dvp, char *name, int namelen, struct vattr *vap, *tl = txdr_unsigned(NFSV4OP_LAYOUTGET); nfsrv_setuplayoutget(nd, NFSLAYOUTIOMODE_RW, 0, UINT64_MAX, 0, stateidp, layouttype, layoutlen, usecurstateid); - error = nfscl_request(nd, dvp, p, cred, dstuff); + error = nfscl_request(nd, dvp, p, cred); if (error != 0) return (error); NFSCL_DEBUG(4, "nfsrpc_createlayout stat=%d err=%d\n", nd->nd_repstat, @@ -8561,7 +8561,7 @@ nfsrpc_copyrpc(vnode_t invp, off_t inoff, vnode_t outvp, off_t outoff, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSWRITEGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, invp, p, cred, NULL); + error = nfscl_request(nd, invp, p, cred); if (error != 0) return (error); if ((nd->nd_flag & ND_NOMOREDATA) == 0) { @@ -8708,7 +8708,7 @@ nfsrpc_seekrpc(vnode_t vp, off_t *offp, nfsv4stateid_t *stateidp, bool *eofp, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, curthread, cred, NULL); + error = nfscl_request(nd, vp, curthread, cred); if (error != 0) return (error); if (nd->nd_repstat == 0) { @@ -8750,7 +8750,7 @@ nfsrpc_getextattr(vnode_t vp, const char *name, struct uio *uiop, ssize_t *lenp, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); if (nd->nd_repstat == 0) { @@ -8830,7 +8830,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct uio *uiop, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); if (nd->nd_repstat == 0) { @@ -8868,7 +8868,7 @@ nfsrpc_rmextattr(vnode_t vp, const char *name, struct nfsvattr *nap, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); if (nd->nd_repstat == 0) { @@ -8909,7 +8909,7 @@ nfsrpc_listextattr(vnode_t vp, uint64_t *cookiep, struct uio *uiop, *tl = txdr_unsigned(NFSV4OP_GETATTR); NFSGETATTR_ATTRBIT(&attrbits); nfsrv_putattrbit(nd, &attrbits); - error = nfscl_request(nd, vp, p, cred, NULL); + error = nfscl_request(nd, vp, p, cred); if (error != 0) return (error); *eofp = true;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202204102108.23AL8N1J081857>