From nobody Thu Jun 16 23:47:26 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 919B8846CC2; Thu, 16 Jun 2022 23:47:26 +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 4LPJkQ3D1Qz4QsM; Thu, 16 Jun 2022 23:47:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655423246; 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=7M/36cPHakHwiFhXiBA78HV3binO6lTbHGkeS9/y2Lg=; b=NaF1LkMpMHITDq/hD0Qxjqanu8nrXGX+frjn4CrZmXPV++ReHO2zciSZmusQes3H2LSDDN 5NKRMyRgN5PSFcbBFIALA9m/DV+bSlliaFkIkaUGFPD7piZi0ZEyXZy7Qreppe4CtUklJd 7abAqtZCutkBvFc2FMHowJhNGODiBVnCFJTVNyEbDDdG/GJ6i1+IC+I+ZzTJOsuHO1IUR6 L73QsUKpiRdEcN2k7GUx20kWw8+H/w7ECz0gRDd2T1CGsC1Ezf+mg7KT3lQJo1xVZfskyV APXQjzGtj4QLeF2mpspf/nL9VxFMrEMSce/de+p518M+kraOwDqlXCG07DO8IA== 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 4E2EB14E3D; Thu, 16 Jun 2022 23:47:26 +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 25GNlQFO003039; Thu, 16 Jun 2022 23:47:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25GNlQT3003038; Thu, 16 Jun 2022 23:47:26 GMT (envelope-from git) Date: Thu, 16 Jun 2022 23:47:26 GMT Message-Id: <202206162347.25GNlQT3003038@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: c692ea402659 - 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: c692ea4026598b6869393c8379ba941348e74cbe Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655423246; 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=7M/36cPHakHwiFhXiBA78HV3binO6lTbHGkeS9/y2Lg=; b=hL6iC+ueN7F9XPeD6yiDll3zAXUIALxVrDCyC2x05GOi7/b9fSOexc9YGF4U1iwo2GVWzn Uyx7eC81jSHrzRL/9bl/KJQwfw4LwTgWeSYwHCCjd5vVjJ3HdJtSpVerwHvNbm9h46RDoA zB4lpzRxX/vwz0NFwHcK69JkeI6P8VAfTB+MitlzE6yOVNnswQIfMKH72xyXf4ODnhw+eT BgN3l+/F+fY07SHLzk35CBJLgdBq20ruhGKBpkk47K6BRaV+EmxL4wPsVRcke3sdnZNOkI TAiqa4fWB1iDSGyYRlX8O7RnMB+4CNzMfx7v409ztEmlS4enWzsO+ljMqJOnMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655423246; a=rsa-sha256; cv=none; b=f5JmH4HaJ3CVZy7E1AmdgPNgdL/mtKlFH7vjl/oeC2IMtsTRmo0MvMpwD2mSjEB6cj8OUz ydXLrNz7p8yArsnflW3YgFEpmzstmnUfADvGfI2FavVOOjaPS2MQ3K0RjiL5gyq24IsSEI rdih17uGC3eZSsuRpdqoN5n7P6dyq/Od/XJPrw/nWQuF/HdmKItMm6hH5LXCymbjR7jm4f 4XqPc3gWb0ZkfUvS2avt28CfKhmWlw+6QZkSJ59d7DhAJHxdQ5YKo/oK3A21Ih+1f3aYZ/ LZzcJ/3P2cJ/v7bvdKyrYAXLymgRwXnkjUxIGCpm5UoGu5WrhEB/93jjWr/UvA== 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=c692ea4026598b6869393c8379ba941348e74cbe commit c692ea4026598b6869393c8379ba941348e74cbe Author: Rick Macklem AuthorDate: 2022-06-16 23:46:06 +0000 Commit: Rick Macklem CommitDate: 2022-06-16 23:46:06 +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 | 8 ++++---- sys/fs/nfsclient/nfs_clrpcops.c | 9 ++++----- sys/fs/nfsclient/nfs_clvfsops.c | 2 +- sys/fs/nfsclient/nfs_clvnops.c | 6 +++--- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index d7bbf6558453..990a017ce372 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -494,11 +494,11 @@ int nfsrpc_mkdir(vnode_t, char *, int, struct vattr *, int nfsrpc_rmdir(vnode_t, char *, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_readdir(vnode_t, struct uio *, nfsuint64 *, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, int *, void *); + NFSPROC_T *, struct nfsvattr *, int *, int *); int nfsrpc_readdirplus(vnode_t, struct uio *, nfsuint64 *, - struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int *, void *); + struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, int *); int nfsrpc_commit(vnode_t, u_quad_t, int, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, void *); + NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_advlock(vnode_t, off_t, int, struct flock *, int, struct ucred *, NFSPROC_T *, void *, int); int nfsrpc_lockt(struct nfsrv_descript *, vnode_t, @@ -508,7 +508,7 @@ int nfsrpc_lock(struct nfsrv_descript *, struct nfsmount *, vnode_t, u_int8_t *, int, struct nfscllockowner *, int, int, u_int64_t, u_int64_t, short, struct ucred *, NFSPROC_T *, int); int nfsrpc_statfs(vnode_t, struct nfsstatfs *, struct nfsfsinfo *, - struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *); + struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_fsinfo(vnode_t, struct nfsfsinfo *, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *); int nfsrpc_pathconf(vnode_t, struct nfsv3_pathconf *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 972a7edd9e31..347d81667e19 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -3210,7 +3210,7 @@ nfsrpc_rmdir(vnode_t dvp, char *name, int namelen, struct ucred *cred, int nfsrpc_readdir(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, - int *eofp, void *stuff) + int *eofp) { int len, left; struct dirent *dp = NULL; @@ -3654,7 +3654,7 @@ nfsmout: int nfsrpc_readdirplus(vnode_t vp, struct uio *uiop, nfsuint64 *cookiep, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, - int *eofp, void *stuff) + int *eofp) { int len, left; struct dirent *dp = NULL; @@ -4188,7 +4188,7 @@ nfsmout: */ int nfsrpc_commit(vnode_t vp, u_quad_t offset, int cnt, 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; @@ -4620,8 +4620,7 @@ nfsmout: */ int nfsrpc_statfs(vnode_t vp, struct nfsstatfs *sbp, struct nfsfsinfo *fsp, - struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, - void *stuff) + struct ucred *cred, NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp) { u_int32_t *tl = NULL; struct nfsrv_descript nfsd, *nd = &nfsd; diff --git a/sys/fs/nfsclient/nfs_clvfsops.c b/sys/fs/nfsclient/nfs_clvfsops.c index 31490c3db51d..343272db31fa 100644 --- a/sys/fs/nfsclient/nfs_clvfsops.c +++ b/sys/fs/nfsclient/nfs_clvfsops.c @@ -316,7 +316,7 @@ nfs_statfs(struct mount *mp, struct statfs *sbp) mtx_unlock(&nmp->nm_mtx); if (!error) error = nfsrpc_statfs(vp, &sb, &fs, td->td_ucred, td, &nfsva, - &attrflag, NULL); + &attrflag); if (error != 0) NFSCL_DEBUG(2, "statfs=%d\n", error); if (attrflag == 0) { diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 5191cc27b77a..2e3cab0799ec 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2536,7 +2536,7 @@ ncl_readdirrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred, (void)ncl_fsinfo(nmp, vp, cred, td); error = nfsrpc_readdir(vp, uiop, &cookie, cred, td, &nfsva, - &attrflag, &eof, NULL); + &attrflag, &eof); if (attrflag) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); @@ -2599,7 +2599,7 @@ ncl_readdirplusrpc(struct vnode *vp, struct uio *uiop, struct ucred *cred, if (NFSHASNFSV3(nmp) && !NFSHASGOTFSINFO(nmp)) (void)ncl_fsinfo(nmp, vp, cred, td); error = nfsrpc_readdirplus(vp, uiop, &cookie, cred, td, &nfsva, - &attrflag, &eof, NULL); + &attrflag, &eof); if (attrflag) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); @@ -2845,7 +2845,7 @@ ncl_commit(struct vnode *vp, u_quad_t offset, int cnt, struct ucred *cred, } mtx_unlock(&nmp->nm_mtx); error = nfsrpc_commit(vp, offset, cnt, cred, td, &nfsva, - &attrflag, NULL); + &attrflag); } if (attrflag != 0) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1);