From nobody Sun Apr 10 21:08:23 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E73E41A98AF6; Sun, 10 Apr 2022 21:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kc4Mq6Ctcz3px8; Sun, 10 Apr 2022 21:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649624903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Iat9hYrEgxPVBfCzyyS4mErRw79i/Pwukqp4i0PVwA=; b=Hka3C2S6g4Q7XVAUR5BrDrBAf4gtssWAknThjYBkUF5sKwCu59Gw3PVQstzCgLYH0prNs6 V6gvZ9YuwYVtji3S1NnDDScjlDvkolL+dr0iLl3nZKwBkIrUh2P4Ld4kCxSxON0T+rQN/k QpRiOWKYBoOvpG+61EAm3cXBeJwhtdUclZ+eKurLSznvKHeNwBe3AjxQZMb8xI7MqcTcZL c3tIB4XeAfOQKo3JEbMXEV2XpX73d9ibqK1+c2tfmKxWKJZVsQDUypZ0N0kfO6yKH9WsaR a5BNPgg8uDY9NNrP51bZ7zk3eSQr2DZgU2dY5xvJsjtA2cZ+EvYdP0HEst0lew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B10E615DC8; Sun, 10 Apr 2022 21:08:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23AL8NQw081858; Sun, 10 Apr 2022 21:08:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23AL8N1J081857; Sun, 10 Apr 2022 21:08:23 GMT (envelope-from git) Date: Sun, 10 Apr 2022 21:08:23 GMT Message-Id: <202204102108.23AL8N1J081857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 5580e5bd7160 - main - nfscl: Clean up the code by removing unused arguments List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5580e5bd7160d9168cc2fc75d415f48ae6963c7e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649624903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+Iat9hYrEgxPVBfCzyyS4mErRw79i/Pwukqp4i0PVwA=; b=NFW6fdjTrEo0sBZoW+PVpAYZzGRGxefttSDKmwzz/8LOakUk3EwwRvH2HarVptOvZhVtJj bocqvdvLxvFAO+EeqKmWNXzrgoqwCtQcUei553y0oeo5cUxzBKsXlVK11OdGLuw56KRNo+ jnem6cpZNlSdvrg/ocQePMrfCVt+9U0JWO4kT+eCFA11NgLoqq8c5HOsXfXdbrEVxENG2q PvEjotm3lBcZ2lOgQ+6EIhExEW8lQ0qmUW6fS7ERADMbs7g8TcV+DvohDGogWzFmvGNd4L jjer3BXoqXxUPYnKn+rbEeoyMXI0YMNWauVB9zp3GsK1RKKrPz72NnVKV4NgnA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649624903; a=rsa-sha256; cv=none; b=aXH2U5dviW+S4bmNA0lSvr0ra1xfVcnv+XX7io6Y2i14BuRKyyc2tur0iRem4+EsmuKa9o QKjUKFzaVYdKcD2dokp7GaTPdMz98H8/QEp/J6ea3TvS6xyU9eozZbX5Qp1KEDTbsfNL3+ jbMODXB6yX7o+rAbS92mmrzWkwSqIisMBNGykv0U8ctlKL5pCcg+Y9ofOePO74Q1Cf1pjV J2P8tpxsdqsh83ebxHqG+TI2YSLd2Wu7ViOjHSUoEOJIiT2lcTdyNlhDAsJrMwPY5NC7KH fbvAlN9L+M8NZ0l04sQYNZkBphqgI3XFRkAA+T4Swel5WsntTmEzfEer3CWnrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=5580e5bd7160d9168cc2fc75d415f48ae6963c7e commit 5580e5bd7160d9168cc2fc75d415f48ae6963c7e Author: Rick Macklem AuthorDate: 2022-04-10 21:05:44 +0000 Commit: Rick Macklem 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;