From nobody Wed Jun 15 23:12:31 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 B7D5E8467BA; Wed, 15 Jun 2022 23:12:31 +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 4LNh0b4smqz4qjV; Wed, 15 Jun 2022 23:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655334751; 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=ZA88SqcIQkPcgukKb29BHY1NeWZ3MeF3220IMV0Ssis=; b=PyKMAVG/D/zS9ROxhuUG1IF5UfyY+sq9AqgRsfOYmk3wbBhv8jBuIMh4A58gendKibnOyc Fvp6o86KrIVUb0LBiH+9ENwmWya1lBghlb6BR0xUAj5RKC0cPcUQVXcef/YWWaGV2kog+X WJyO0J3+002RnHnC6snAMBbUsagTSTjDjwROYj+ZUbxp1Drn8vQABYBz6xkSrNcsVkeiQc NMdOcPb0ZaLY5wgFS0UnX0JpJ47Feq1/oPvfk7/iQrr0BdGJNimqUxqBe8zzm2hlNF1lNg 73HIZkhJFPCBkYinr0jN9ViZ62EXdx4wLxJPH0QX1BfljNeYfC8VKEqZiW609w== 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 876CF27C85; Wed, 15 Jun 2022 23:12:31 +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 25FNCVmD006828; Wed, 15 Jun 2022 23:12:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FNCVAU006827; Wed, 15 Jun 2022 23:12:31 GMT (envelope-from git) Date: Wed, 15 Jun 2022 23:12:31 GMT Message-Id: <202206152312.25FNCVAU006827@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: 8cb42d6918cb - 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: 8cb42d6918cb705327d50d9143a60b349fb754a4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655334751; 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=ZA88SqcIQkPcgukKb29BHY1NeWZ3MeF3220IMV0Ssis=; b=mXe9j3X5itcQqzyRwEkqWIZesO2mKkdStLk6/UiEwiVkzmEX3OV9TWrAlZ7+n7OLXG7bFx p+xpjpgysyhV1BGLqJ2B8ShRpUtvWKxXjoC58fb0qhsIFMPZUfzYnoa5YgCVUJrDze7hO3 Ap6uO9fVlwnxoEhzeBYPYs5BqLX4j9A+wET8pKWKDInvuz/zdXsBg2rOLCYyk0HhMrRw26 tWzlXO+GpsgKnjvCxlG1NApjk0a3o1iHYTFdk4E7d23vPVTGMVxH3DEbXwKU6U1Xx5PquY KRrZ9U3YLEuIov111+U2WBKNE197VcfAytX0L2a6WWGaPx8ljZVNp35N2v/0iA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655334751; a=rsa-sha256; cv=none; b=rwLONlqbZAigksp3+6w6WtByfaAkawo1KGHzIqbhQ07TxsWWDTLPGOhrUESq8mpOQijgGJ Wrk6DN+lS9H3QoTRyv9LWo7cJ3oR+hD/i8oDMYPj1vlBZCvoDV5gy3IdD0lXNm1ogLTd34 Jz7Z+8cKh7n8EcAw270R3VVUPz5bEHdqxO4MAVxQ7/U6A2Et3p8aB8EHJiHo1vFPYE892Y BO45GHrFY3UP47Abz0LpGppQt8aLbdSTfolaBF6TA2TIOb44j0346Ab9mkkGqe1OBu44Uu dtARII3YdPY4ers60oJkB2QJ3bVmVtF7R9HaBZrcbSvH3iM6Iat4denBcX6wAg== 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=8cb42d6918cb705327d50d9143a60b349fb754a4 commit 8cb42d6918cb705327d50d9143a60b349fb754a4 Author: Rick Macklem AuthorDate: 2022-06-15 23:10:50 +0000 Commit: Rick Macklem CommitDate: 2022-06-15 23:10:50 +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 | 7 +++---- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index a774ceb148f5..893514b4e1c6 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -478,13 +478,13 @@ int nfsrpc_create(vnode_t, char *, int, struct vattr *, nfsquad_t, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, struct nfsfh **, int *, int *); int nfsrpc_remove(vnode_t, char *, int, vnode_t, struct ucred *, NFSPROC_T *, - struct nfsvattr *, int *, void *); + struct nfsvattr *, int *); int nfsrpc_rename(vnode_t, vnode_t, char *, int, vnode_t, vnode_t, char *, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, - int *, int *, void *, void *); + int *, int *); int nfsrpc_link(vnode_t, vnode_t, char *, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, - int *, int *, void *); + int *, int *); int nfsrpc_symlink(vnode_t, char *, int, const char *, struct vattr *, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, struct nfsfh **, int *, int *, void *); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 8162a9572c75..49ccad116ff3 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2714,8 +2714,7 @@ nfsmout: */ int nfsrpc_remove(vnode_t dvp, char *name, int namelen, vnode_t vp, - struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, int *dattrflagp, - void *dstuff) + struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, int *dattrflagp) { u_int32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -2793,7 +2792,7 @@ int nfsrpc_rename(vnode_t fdvp, vnode_t fvp, char *fnameptr, int fnamelen, vnode_t tdvp, vnode_t tvp, char *tnameptr, int tnamelen, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *fnap, struct nfsvattr *tnap, - int *fattrflagp, int *tattrflagp, void *fstuff, void *tstuff) + int *fattrflagp, int *tattrflagp) { u_int32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -2949,7 +2948,7 @@ nfsmout: int nfsrpc_link(vnode_t dvp, vnode_t vp, char *name, int namelen, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, - struct nfsvattr *nap, int *attrflagp, int *dattrflagp, void *dstuff) + struct nfsvattr *nap, int *attrflagp, int *dattrflagp) { u_int32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 9b56585a3514..a972836092be 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1953,7 +1953,7 @@ nfs_removerpc(struct vnode *dvp, struct vnode *vp, char *name, dnp->n_flag |= NREMOVEINPROG; NFSUNLOCKNODE(dnp); error = nfsrpc_remove(dvp, name, namelen, vp, cred, td, &dnfsva, - &dattrflag, NULL); + &dattrflag); NFSLOCKNODE(dnp); if ((dnp->n_flag & NREMOVEWANT)) { dnp->n_flag &= ~(NREMOVEWANT | NREMOVEINPROG); @@ -2139,7 +2139,7 @@ nfs_renamerpc(struct vnode *fdvp, struct vnode *fvp, char *fnameptr, error = nfsrpc_rename(fdvp, fvp, fnameptr, fnamelen, tdvp, tvp, tnameptr, tnamelen, cred, td, &fnfsva, &tnfsva, &fattrflag, - &tattrflag, NULL, NULL); + &tattrflag); NFSLOCKNODE(fdnp); fdnp->n_flag |= NMODIFIED; if (fattrflag != 0) { @@ -2186,8 +2186,7 @@ nfs_link(struct vop_link_args *ap) VOP_FSYNC(vp, MNT_WAIT, curthread); error = nfsrpc_link(tdvp, vp, cnp->cn_nameptr, cnp->cn_namelen, - cnp->cn_cred, curthread, &dnfsva, &nfsva, &attrflag, - &dattrflag, NULL); + cnp->cn_cred, curthread, &dnfsva, &nfsva, &attrflag, &dattrflag); tdnp = VTONFS(tdvp); NFSLOCKNODE(tdnp); tdnp->n_flag |= NMODIFIED;