From nobody Tue Jun 14 20:37:52 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 EE28683FB36; Tue, 14 Jun 2022 20:37:52 +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 4LN0cc6L56z4cSW; Tue, 14 Jun 2022 20:37:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655239072; 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=z4PE3/evEtf+5hjKABm1+nOeEcpThgT6UApbQVMn0c0=; b=nfT3qBvOI38k7Sf/wJwdVCmq/5c4+6BRpRaR2n2zauIa9xOML+WrajTQTwLztjVnBxRt7q aepnenbM98GM2ryOQ9jRCfnC+4DiHRvbf7o+AOop6uWGDXKRQm1buw11bta7t1CFXb1bd8 LkjDRXjqTSNGUp4PLXDBUGU6P38f7wRkhWKLk6kA9bMzSnv7Wk+2bZvXyjKQTcBpxVJEKv jRqha4+llF9FuXkbE5WP86XwoY3AgFpnMouRTCQ5T76KGmP3cJB8vGhTEqeHOMCX7zlGi/ +MHbOSRSmWDte0VMr5qbZTNdwb8y1XeCi0O+0GRj/jjCzibBfEGjP6PiFPJvbw== 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 B54AE11809; Tue, 14 Jun 2022 20:37:52 +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 25EKbqpd049171; Tue, 14 Jun 2022 20:37:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25EKbqJr049170; Tue, 14 Jun 2022 20:37:52 GMT (envelope-from git) Date: Tue, 14 Jun 2022 20:37:52 GMT Message-Id: <202206142037.25EKbqJr049170@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: 1c665e95d449 - 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: 1c665e95d4498f78bfd02939f9777f0ff23ed2be Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655239072; 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=z4PE3/evEtf+5hjKABm1+nOeEcpThgT6UApbQVMn0c0=; b=KMeIiPdh/KuhkdaH8QkU+D/4pZEDXS/0lgLIZnIsofUPIZQtoEVD3Xj54QoOiBBjPdsM7q HWvEeurB6VEkaJ35CwSflyz4vhIAPXRjMkr6BJ3ck4xTN7N/085AstfOMiSO/7cAimyyM+ 5Mg5pIkq5LRIvY6WHTpyTdXLJLvjQWxYTXlu6bEF8m7GEqFxwWIYvIBFO6nXs8k92eBkHv N7sHzJ04EnWd25wGDGjr+2G8PnV3EQhrUUUP8JxfkpkU3vW4OhNTy8OYecl3zexzpO1ZAC I1PzJIc3JWTaK0jRkp6IBhuiFCz7K6TmNPRgaADBar4BvCBXkp7N0qeols/t9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655239072; a=rsa-sha256; cv=none; b=gUdCItJkJX60eLeIBVe1Y4tJIW2FK0QYLWCzo7wpGDdVzdiiCHrwEIQ/5Vb9kDdy8RpSKD FNe2Y/X514o/4UstpxJuwyE7+Hxao5XkU+ojothmJ7LGvS/NwNa99C6sv/4qlGtbRVeWdb /E/5NdPMHEmxMgN6YNyyUPhPeQdptstr++XMM8233SEJiCvxEWlGnmas0knOtDmw0jsjgz Sa0riLUUTdDFoJIBU4KyFykeNuyThCW1iwrS/8tmq4Iq3QGvngkfg+3JSlvdT1M3qtqI4c XfNnllckj4U30DmhtjJxJmjHK0fPwVeCCejBqMKgoNBxq3/tmWShnETgn9gN0Q== 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=1c665e95d4498f78bfd02939f9777f0ff23ed2be commit 1c665e95d4498f78bfd02939f9777f0ff23ed2be Author: Rick Macklem AuthorDate: 2022-06-14 20:35:25 +0000 Commit: Rick Macklem CommitDate: 2022-06-14 20:35:25 +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 | 6 +++--- sys/fs/nfsclient/nfs_clrpcops.c | 7 +++---- sys/fs/nfsclient/nfs_clvnops.c | 14 ++++++-------- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index c1ba03a9f2fc..dc50982e5e6c 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -464,11 +464,11 @@ int nfsrpc_setattr(vnode_t, struct vattr *, NFSACL_T *, struct ucred *, 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); + uint32_t); int nfsrpc_readlink(vnode_t, struct uio *, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, void *); + NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_read(vnode_t, struct uio *, struct ucred *, NFSPROC_T *, - struct nfsvattr *, int *, void *); + struct nfsvattr *, int *); int nfsrpc_write(vnode_t, struct uio *, int *, int *, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int, int); int nfsrpc_mknod(vnode_t, char *, int, struct vattr *, u_int32_t, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 02205802dc16..a27ee1ab034c 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -1395,8 +1395,7 @@ nfsrpc_setattrrpc(vnode_t vp, struct vattr *vap, int nfsrpc_lookup(vnode_t dvp, char *name, int len, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, struct nfsvattr *nap, - struct nfsfh **nfhpp, int *attrflagp, int *dattrflagp, void *stuff, - uint32_t openmode) + struct nfsfh **nfhpp, int *attrflagp, int *dattrflagp, uint32_t openmode) { uint32_t deleg, rflags, *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -1635,7 +1634,7 @@ nfsmout: */ int nfsrpc_readlink(vnode_t vp, struct uio *uiop, 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; @@ -1691,7 +1690,7 @@ nfsmout: */ int nfsrpc_read(vnode_t vp, struct uio *uiop, struct ucred *cred, - NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, void *stuff) + NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp) { int error, expireret = 0, retrycnt; u_int32_t clidrev = 0; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 10f6cae17a65..7c2873c6200f 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1346,7 +1346,7 @@ nfs_lookup(struct vop_lookup_args *ap) nanouptime(&ts); error = nfsrpc_lookup(dvp, cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_cred, td, &dnfsva, &nfsva, &nfhp, &attrflag, &dattrflag, - NULL, openmode); + openmode); if (dattrflag) (void) nfscl_loadattrcache(&dvp, &dnfsva, NULL, 0, 1); if (error) { @@ -1567,7 +1567,7 @@ ncl_readlinkrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred) struct nfsvattr nfsva; error = nfsrpc_readlink(vp, uiop, cred, uiop->uio_td, &nfsva, - &attrflag, NULL); + &attrflag); if (attrflag) { ret = nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (ret && !error) @@ -1598,7 +1598,7 @@ ncl_readrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred) NFSCL_DEBUG(4, "readrpc: aft doiods=%d\n", error); if (error != 0) error = nfsrpc_read(vp, uiop, cred, uiop->uio_td, &nfsva, - &attrflag, NULL); + &attrflag); if (attrflag) { ret = nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (ret && !error) @@ -1678,8 +1678,7 @@ nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, if (!nfhp) (void) nfsrpc_lookup(dvp, cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_cred, curthread, - &dnfsva, &nfsva, &nfhp, &attrflag, &dattrflag, - NULL, 0); + &dnfsva, &nfsva, &nfhp, &attrflag, &dattrflag, 0); if (nfhp) error = nfscl_nget(dvp->v_mount, dvp, nfhp, cnp, curthread, &np, LK_EXCLUSIVE); @@ -1793,8 +1792,7 @@ again: if (nfhp == NULL) (void) nfsrpc_lookup(dvp, cnp->cn_nameptr, cnp->cn_namelen, cnp->cn_cred, curthread, - &dnfsva, &nfsva, &nfhp, &attrflag, &dattrflag, - NULL, 0); + &dnfsva, &nfsva, &nfhp, &attrflag, &dattrflag, 0); if (nfhp != NULL) error = nfscl_nget(dvp->v_mount, dvp, nfhp, cnp, curthread, &np, LK_EXCLUSIVE); @@ -2711,7 +2709,7 @@ nfs_lookitup(struct vnode *dvp, char *name, int len, struct ucred *cred, nanouptime(&ts); error = nfsrpc_lookup(dvp, name, len, cred, td, &dnfsva, &nfsva, - &nfhp, &attrflag, &dattrflag, NULL, 0); + &nfhp, &attrflag, &dattrflag, 0); if (dattrflag) (void) nfscl_loadattrcache(&dvp, &dnfsva, NULL, 0, 1); if (npp && !error) {