From nobody Mon Jun 13 22:59:46 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 46079846179; Mon, 13 Jun 2022 22:59:47 +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 4LMRpq1Jr4z4pb2; Mon, 13 Jun 2022 22:59:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655161187; 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=S5W+MFqFKvPNae7VckCHLucdhp0xwNHycQxWJs4oFKE=; b=IuDqXPwHvuN+oxUWIrwtWKSlCJJZGQzqR4p6V+/VuRiFbKqAuuUQyS6EFY2YL3CQdQyBFB kuePAGlMcpbAZLM5VKBnlug901tsvk87BbcOKCF05Xl7dD+yWEy/Ws/ky1wfoaztr8539Z aNhz+ThUz5iAIrPePu0B8LhzwdzT5pMVv9TjKGeWu6CxH4RnSynmu9RTjsorV8+B7K3z67 mtq4vp36m77T71ONF4eryAQbKVzXMkneeITHK2Sa3JWl8GI5cI+T4sPqwMlXSvAGvJ+ury YEBNMDeyavLqE5Y0T4wKg2yLyGmU2rIAsByQeNH+Ko3WjjB/hzgvpTNwD0NMJw== 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 08CE91EC10; Mon, 13 Jun 2022 22:59:47 +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 25DMxkAm094885; Mon, 13 Jun 2022 22:59:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25DMxk29094884; Mon, 13 Jun 2022 22:59:46 GMT (envelope-from git) Date: Mon, 13 Jun 2022 22:59:46 GMT Message-Id: <202206132259.25DMxk29094884@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: 41c029d506a5 - 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: 41c029d506a5acb5be2a4892379cca6bf00f9923 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655161187; 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=S5W+MFqFKvPNae7VckCHLucdhp0xwNHycQxWJs4oFKE=; b=TjGelEsb3cmN5fg8qsJYDhUnjhVRr0/L8b8eYWq2m3o04UhQZNU/piPV1Ae0n8CH8VtvHQ aAQjgx8wPkRD7QW/U0YkxMcESKT2HA+JNAdti5eb/5Xm4cgKH1+EwydbOyHpIcHUVbVdhB tFMOOD069gKTsbVgdaEC3UI47xkmTTlV40ihKthjc2ovKDmjt0c9/fQ3hcydfGu5s5Zy1q b4bWx1Em8II18rfLMnFsRSfL+RKezbBbi+d76rOCpapjPnvbrBYORlT1FpZsmfEum1Bahh XMRvHni65No/jEutSKQs3VEQhRyQEtbJzKBHSp+fQmX6t0oYjrtT/68bkdQR8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655161187; a=rsa-sha256; cv=none; b=Tjj4szdy6bd/leIsKiDragvffyCd6XjqSHUVbvE1W3KAJZ80iJJOaJJw8EN5/07wc9nXzU aUIO4VKEkfo/QTbzRpeCTZ9gKwgVin3oFK6Hvy+aN+UfcyvWPmE33kp1qbevIPFs86CORv dH+9sZOG2flD2iRqbvMdiszqk+vnFWcgECgSWWw/P7EmIvBy4eIOMeoW80q4Th+HJRrplz E09q5mohTvejoXVFpTprOqSsBtpWgdVSVgsd5TXA6F6Fk8yQ6F2T8pqIalOtjdDW1xJwoY q+OPiBcaIZ8KglGE3rP22YUQFRyfG+es5alN7DFa8Xf+DazTV4mrlO7cq41qlA== 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=41c029d506a5acb5be2a4892379cca6bf00f9923 commit 41c029d506a5acb5be2a4892379cca6bf00f9923 Author: Rick Macklem AuthorDate: 2022-06-13 22:57:42 +0000 Commit: Rick Macklem CommitDate: 2022-06-13 22:57:42 +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 | 7 +++---- sys/fs/nfsclient/nfs_clrpcops.c | 13 +++++-------- sys/fs/nfsclient/nfs_clvnops.c | 19 ++++++++----------- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index c4dc2451523e..c1ba03a9f2fc 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -443,7 +443,7 @@ int nfsrpc_null(vnode_t, struct ucred *, NFSPROC_T *); int nfsrpc_access(vnode_t, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *); int nfsrpc_accessrpc(vnode_t, u_int32_t, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, u_int32_t *, void *); + NFSPROC_T *, struct nfsvattr *, int *, u_int32_t *); int nfsrpc_open(vnode_t, int, struct ucred *, NFSPROC_T *); int nfsrpc_openrpc(struct nfsmount *, vnode_t, u_int8_t *, int, u_int8_t *, int, u_int32_t, struct nfsclopen *, u_int8_t *, int, struct nfscldeleg **, int, @@ -457,12 +457,11 @@ int nfsrpc_openconfirm(vnode_t, u_int8_t *, int, struct nfsclopen *, struct ucred *, NFSPROC_T *); int nfsrpc_setclient(struct nfsmount *, struct nfsclclient *, int, bool *, struct ucred *, NFSPROC_T *); -int nfsrpc_getattr(vnode_t, struct ucred *, NFSPROC_T *, - struct nfsvattr *, void *); +int nfsrpc_getattr(vnode_t, struct ucred *, NFSPROC_T *, struct nfsvattr *); int nfsrpc_getattrnovp(struct nfsmount *, u_int8_t *, int, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, u_int64_t *, uint32_t *); int nfsrpc_setattr(vnode_t, struct vattr *, NFSACL_T *, struct ucred *, - NFSPROC_T *, struct nfsvattr *, int *, void *); + 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); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index b785446b1ae6..02205802dc16 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -281,8 +281,7 @@ nfsrpc_access(vnode_t vp, int acmode, struct ucred *cred, /* * Now, just call nfsrpc_accessrpc() to do the actual RPC. */ - error = nfsrpc_accessrpc(vp, mode, cred, p, nap, attrflagp, &rmode, - NULL); + error = nfsrpc_accessrpc(vp, mode, cred, p, nap, attrflagp, &rmode); /* * The NFS V3 spec does not clarify whether or not @@ -299,8 +298,7 @@ nfsrpc_access(vnode_t vp, int acmode, struct ucred *cred, */ int nfsrpc_accessrpc(vnode_t vp, u_int32_t mode, struct ucred *cred, - NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, u_int32_t *rmodep, - void *stuff) + NFSPROC_T *p, struct nfsvattr *nap, int *attrflagp, u_int32_t *rmodep) { u_int32_t *tl; u_int32_t supported, rmode; @@ -1204,7 +1202,7 @@ nfsmout: */ int nfsrpc_getattr(vnode_t vp, struct ucred *cred, NFSPROC_T *p, - struct nfsvattr *nap, void *stuff) + struct nfsvattr *nap) { struct nfsrv_descript nfsd, *nd = &nfsd; int error; @@ -1271,8 +1269,7 @@ nfsrpc_getattrnovp(struct nfsmount *nmp, u_int8_t *fhp, int fhlen, int syscred, */ int nfsrpc_setattr(vnode_t vp, struct vattr *vap, NFSACL_T *aclp, - struct ucred *cred, NFSPROC_T *p, struct nfsvattr *rnap, int *attrflagp, - void *stuff) + struct ucred *cred, NFSPROC_T *p, struct nfsvattr *rnap, int *attrflagp) { int error, expireret = 0, openerr, retrycnt; u_int32_t clidrev = 0, mode; @@ -5036,7 +5033,7 @@ nfsrpc_setacl(vnode_t vp, struct ucred *cred, NFSPROC_T *p, if (nfsrv_useacl == 0 || !NFSHASNFSV4(nmp)) return (EOPNOTSUPP); - error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL, stuff); + error = nfsrpc_setattr(vp, NULL, aclp, cred, p, NULL, NULL); return (error); } diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index af48b5036969..10f6cae17a65 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -407,7 +407,7 @@ nfs34_access_otw(struct vnode *vp, int wmode, struct thread *td, struct nfsvattr nfsva; error = nfsrpc_accessrpc(vp, wmode, cred, td, &nfsva, &attrflag, - &rmode, NULL); + &rmode); if (attrflag) (void) nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (!error) { @@ -948,8 +948,7 @@ nfs_close(struct vop_close_args *ap) if (error == 0 && nfscl_mustflush(vp) != 0 && vp->v_type == VREG && (VFSTONFS(vp->v_mount)->nm_flag & NFSMNT_NOCTO) == 0) { - ret = nfsrpc_getattr(vp, cred, ap->a_td, &nfsva, - NULL); + ret = nfsrpc_getattr(vp, cred, ap->a_td, &nfsva); if (!ret) { np->n_change = nfsva.na_filerev; (void) nfscl_loadattrcache(&vp, &nfsva, NULL, @@ -1029,7 +1028,7 @@ nfs_getattr(struct vop_getattr_args *ap) return (0); } } - error = nfsrpc_getattr(vp, ap->a_cred, td, &nfsva, NULL); + error = nfsrpc_getattr(vp, ap->a_cred, td, &nfsva); if (!error) error = nfscl_loadattrcache(&vp, &nfsva, vap, 0, 0); if (!error) { @@ -1186,8 +1185,7 @@ nfs_setattrrpc(struct vnode *vp, struct vattr *vap, struct ucred *cred, NFSUNLOCKNODE(np); KDTRACE_NFS_ACCESSCACHE_FLUSH_DONE(vp); } - error = nfsrpc_setattr(vp, vap, NULL, cred, td, &nfsva, &attrflag, - NULL); + error = nfsrpc_setattr(vp, vap, NULL, cred, td, &nfsva, &attrflag); if (attrflag) { ret = nfscl_loadattrcache(&vp, &nfsva, NULL, 0, 1); if (ret && !error) @@ -1806,8 +1804,8 @@ again: if (!error) { newvp = NFSTOV(np); if (attrflag == 0) - error = nfsrpc_getattr(newvp, cnp->cn_cred, - curthread, &nfsva, NULL); + error = nfsrpc_getattr(newvp, cnp->cn_cred, curthread, + &nfsva); if (error == 0) error = nfscl_loadattrcache(&newvp, &nfsva, NULL, 0, 1); } @@ -1824,15 +1822,14 @@ again: } else if (NFS_ISV34(dvp) && (fmode & O_EXCL)) { if (nfscl_checksattr(vap, &nfsva)) { error = nfsrpc_setattr(newvp, vap, NULL, cnp->cn_cred, - curthread, &nfsva, &attrflag, NULL); + curthread, &nfsva, &attrflag); if (error && (vap->va_uid != (uid_t)VNOVAL || vap->va_gid != (gid_t)VNOVAL)) { /* try again without setting uid/gid */ vap->va_uid = (uid_t)VNOVAL; vap->va_gid = (uid_t)VNOVAL; error = nfsrpc_setattr(newvp, vap, NULL, - cnp->cn_cred, curthread, &nfsva, - &attrflag, NULL); + cnp->cn_cred, curthread, &nfsva, &attrflag); } if (attrflag) (void) nfscl_loadattrcache(&newvp, &nfsva, NULL,