From nobody Thu Jun 16 23:18:19 2022 X-Original-To: dev-commits-src-main@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 70B358422F3; Thu, 16 Jun 2022 23:18:19 +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 4LPJ4q2fnqz3ssq; Thu, 16 Jun 2022 23:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655421499; 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=WT4n8dN98E+yBBLJzhY0q6C8PvGl1CIqy4DwVz+pAKY=; b=qUrNwQmikkg/fsKIUvIdB8kPLFSJkZcz2wM4g7iPbqeINjDWItc5Uza7WzBASo29lR2/+Q XyXeMQ6altCCAWGqcGpUHE03FWsUK1duYDIxd+v8icuAqgSmB2SboSDk9voXEBFMMr9gPu ZRu8bA0PsKpOR9jjCwHsSbdkvs5rUofnWxO4Lgu+pAdBL7klK6McWYC+G2UtaOxeQeV5Cf g4riiNR8ycz4Oba5alE5aTQ+crtDX3lwQh2EVLPZ5I2bLTw8Dpjh78eE52cPRh2oyK6D1f rNmnq/bG8x6BRI8ARptLvetY1B4Oa/HoCgjme4Q4sUSV6a6M8OR17ip7uH5rAg== 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 311D614924; Thu, 16 Jun 2022 23:18:19 +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 25GNIJPF062906; Thu, 16 Jun 2022 23:18:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GNIJJ4062905; Thu, 16 Jun 2022 23:18:19 GMT (envelope-from git) Date: Thu, 16 Jun 2022 23:18:19 GMT Message-Id: <202206162318.25GNIJJ4062905@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: af6665e0aa72 - main - nfscl: Clean up the code by removing unused arguments List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: af6665e0aa7290f26a3a6be0b49dcb75b4d54722 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655421499; 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=WT4n8dN98E+yBBLJzhY0q6C8PvGl1CIqy4DwVz+pAKY=; b=dyJzkUcHb5TtocVjb9Ydmd9MjhK4ENEoWlD7eJyXu8H8SC8tk9Foja/mPbR3a4UFIGcxir 9rD4hClx9pAIvPchh3SXbYXL+6+JQUVGP53KfdHl539WLat4fRULNmWVtD9SQ8LCOQMqYT tbsbTQbiecmSBvr4zIqXRovo/9cnvXKrW0mkwnbibX2iRkXOzSnciJbDAsKHLZEUbuoe+O K7iSba29oiYSbEN/Wl88vGbgReMQ9SbQbdZ2DqJMh/5oHyxdwXIyN6vTh/VVfU4zopV4db 8GuCLh6Ex92s4nNZbUvh5OcQqmt6g7XyhE7vyKgw2OgPp1Mbg60eGEHZYSVbmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655421499; a=rsa-sha256; cv=none; b=YAkXpuirrNTGfs8tDkWTtmoN/MfukjyiA9r8+uoikjccD/G9nwglK1wWyGyz3E4XpK8Ecw 1m2LHbG2ONWCHe0s02SNiUDjMWlRcEBDYlrjTFAjEQpsK6EcNsT9CViGSo9nHfPYZ4Sl2y EKUOlz1ZLL5ntSI6tvvOpG3gBIvZXwEYfDR5LVHor+4rRgU1HpV9cVbm8eUzW2/QveQsuJ xKje+8+2zcR7bbe3UL6o3H5CnaYyBGBBxOIjaUgGQTUyZhAkdlx9wgCZr6Ax2cx0tJvYJa RecnXdNlLI+/25p9/v4oxV4OETLH4XPPamBWpCGHPXU6F6NUCkn8QQXoS+w9uQ== 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=af6665e0aa7290f26a3a6be0b49dcb75b4d54722 commit af6665e0aa7290f26a3a6be0b49dcb75b4d54722 Author: Rick Macklem AuthorDate: 2022-06-16 23:17:13 +0000 Commit: Rick Macklem CommitDate: 2022-06-16 23:17:13 +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 | 6 +++--- sys/fs/nfsclient/nfs_clvnops.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 893514b4e1c6..d7bbf6558453 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -487,12 +487,12 @@ int nfsrpc_link(vnode_t, vnode_t, char *, int, 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 *); + struct nfsfh **, int *, int *); int nfsrpc_mkdir(vnode_t, char *, int, struct vattr *, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, - struct nfsfh **, int *, int *, void *); + struct nfsfh **, int *, int *); int nfsrpc_rmdir(vnode_t, char *, int, struct ucred *, NFSPROC_T *, - struct nfsvattr *, int *, void *); + struct nfsvattr *, int *); int nfsrpc_readdir(vnode_t, struct uio *, nfsuint64 *, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int *, void *); int nfsrpc_readdirplus(vnode_t, struct uio *, nfsuint64 *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 49ccad116ff3..972a7edd9e31 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -3012,7 +3012,7 @@ int nfsrpc_symlink(vnode_t dvp, char *name, int namelen, const char *target, struct vattr *vap, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, struct nfsvattr *nnap, struct nfsfh **nfhpp, int *attrflagp, - int *dattrflagp, void *dstuff) + int *dattrflagp) { u_int32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -3073,7 +3073,7 @@ int nfsrpc_mkdir(vnode_t dvp, char *name, int namelen, struct vattr *vap, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, struct nfsvattr *nnap, struct nfsfh **nfhpp, int *attrflagp, - int *dattrflagp, void *dstuff) + int *dattrflagp) { u_int32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -3153,7 +3153,7 @@ nfsmout: */ int nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred, - NFSPROC_T *p, struct nfsvattr *dnap, int *dattrflagp, void *dstuff) + NFSPROC_T *p, struct nfsvattr *dnap, int *dattrflagp) { struct nfsrv_descript nfsd, *nd = &nfsd; int error = 0; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index a972836092be..5191cc27b77a 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2245,7 +2245,7 @@ nfs_symlink(struct vop_symlink_args *ap) vap->va_type = VLNK; error = nfsrpc_symlink(dvp, cnp->cn_nameptr, cnp->cn_namelen, ap->a_target, vap, cnp->cn_cred, curthread, &dnfsva, - &nfsva, &nfhp, &attrflag, &dattrflag, NULL); + &nfsva, &nfhp, &attrflag, &dattrflag); if (nfhp) { ret = nfscl_nget(dvp->v_mount, dvp, nfhp, cnp, curthread, &np, LK_EXCLUSIVE); @@ -2328,7 +2328,7 @@ nfs_mkdir(struct vop_mkdir_args *ap) vap->va_type = VDIR; error = nfsrpc_mkdir(dvp, cnp->cn_nameptr, cnp->cn_namelen, vap, cnp->cn_cred, curthread, &dnfsva, &nfsva, &nfhp, - &attrflag, &dattrflag, NULL); + &attrflag, &dattrflag); dnp = VTONFS(dvp); NFSLOCKNODE(dnp); dnp->n_flag |= NMODIFIED; @@ -2405,7 +2405,7 @@ nfs_rmdir(struct vop_rmdir_args *ap) if (dvp == vp) return (EINVAL); error = nfsrpc_rmdir(dvp, cnp->cn_nameptr, cnp->cn_namelen, - cnp->cn_cred, curthread, &dnfsva, &dattrflag, NULL); + cnp->cn_cred, curthread, &dnfsva, &dattrflag); dnp = VTONFS(dvp); NFSLOCKNODE(dnp); dnp->n_flag |= NMODIFIED;