From nobody Wed Jun 15 20:13:40 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 0D16E858C48; Wed, 15 Jun 2022 20:13:41 +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 4LNc2D6qQ0z3vTG; Wed, 15 Jun 2022 20:13:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655324021; 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=ljIahE1ZnXBCya8l5CHo5aBLcy4QzHegQJII6BKgSgY=; b=gGjQJE7sLiFEgaya/GsvuhiFqIFPiOmiqJ1RzQS5tXUn3eys/zg743jy6Rx/beL9yg9EwQ +mta2Cg3MLfIvJBIx26cOo1pBVn27HDqy1EuQltDiTiaBxVEGgX/KDvL7gfJo7u3JDyaQz NmBsSbwjCyEi1tD9r1729FyALVgHJj4mvMxS1NPjLsVWAMbwAJ2lUCaycHO0ecOVRMU5q8 aihKgMHvjEIwNXa/+yJ1eTORyDQHZEKgymcixJC44ezcIh2wRseNvS9ed1PzFLvc8+1kIl E75Gg2o/3LsDrhQ/qgukD2yEwECqkCrHR7S96bxJ61KrT95XN6M1qFWN20DZWg== 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 CAAFA25476; Wed, 15 Jun 2022 20:13:40 +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 25FKDe3R063118; Wed, 15 Jun 2022 20:13:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FKDeaZ063117; Wed, 15 Jun 2022 20:13:40 GMT (envelope-from git) Date: Wed, 15 Jun 2022 20:13:40 GMT Message-Id: <202206152013.25FKDeaZ063117@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: da47c186ac32 - 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: da47c186ac321693984f4ad91915b951887ff70f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655324021; 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=ljIahE1ZnXBCya8l5CHo5aBLcy4QzHegQJII6BKgSgY=; b=UcyuR5cXB0pCAwXbbAVjRYRQK1Cddl6eI6kou93Y+RyzCbvuQiyb2d1v7n5NmA+cs9QNIz hNAGJLR15R53hc2k4QETMoZ2Oaz/FIVsKFU7FzoDQIQkP3TqU/skO0EQV2Vuxd/KDzjaN3 LDWdrNUxRkStiS+lSbs/exEp6JghsJe8dXRMjeHautFKxdo05aN4yOlikYk0f7vMzK0XJF aiLHY55rlBlMD861gxYGgJ9lRXmd4QI3wqrD1tsK+RtgGjkEt7IKo85VgpKJejntLJVgIn 2m7IelDpQhMBIrkz0vqGQHqaRu+swi72aj3omMoqq+NP54VZSqp2YDJHBuGf6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655324021; a=rsa-sha256; cv=none; b=OsqVftgMuSrrW3ze90Kvd3D4MqAi6ItCizvcT6i1Kk5eITR6StZhD/VkIV1vuNDU89zyF9 S/urVf2+gfoQwZfxxk8/WGRp+WD9L4dQfwv2+LZWdQQyhp7yzhemhhpWlS0CHBg0IC2HBG vG4mub86frv/2/27qjhaNMe+69iYF2+1zMejlq1m8t/Tv8h0r8c7jAq/hskdSqXKjO+A8C pYt78KOQRuHIryvd3lI3/eCheqdROKgrPOVeBGskbjd597boOTziYMFv9gsiV1NLAbsjfJ N+d5HNRKgjepAywJOzTnWvxfUmWWnosAARuHO3vJeUx+h6VG0wQH2enHpZxc+Q== 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=da47c186ac321693984f4ad91915b951887ff70f commit da47c186ac321693984f4ad91915b951887ff70f Author: Rick Macklem AuthorDate: 2022-06-15 20:10:44 +0000 Commit: Rick Macklem CommitDate: 2022-06-15 20:12:54 +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 dc50982e5e6c..a774ceb148f5 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -473,10 +473,10 @@ 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, enum vtype, struct ucred *, NFSPROC_T *, struct nfsvattr *, - struct nfsvattr *, struct nfsfh **, int *, int *, void *); + struct nfsvattr *, struct nfsfh **, int *, int *); int nfsrpc_create(vnode_t, char *, int, struct vattr *, nfsquad_t, int, struct ucred *, NFSPROC_T *, struct nfsvattr *, struct nfsvattr *, - struct nfsfh **, int *, int *, void *); + struct nfsfh **, int *, int *); int nfsrpc_remove(vnode_t, char *, int, vnode_t, struct ucred *, NFSPROC_T *, struct nfsvattr *, int *, void *); int nfsrpc_rename(vnode_t, vnode_t, char *, int, vnode_t, vnode_t, char *, int, @@ -551,7 +551,7 @@ void nfscl_freenfsclds(struct nfsclds *); int nfsrpc_allocate(vnode_t, off_t, off_t, struct nfsvattr *, int *, struct ucred *, NFSPROC_T *, void *); int nfsrpc_deallocate(vnode_t, off_t, off_t, struct nfsvattr *, int *, - struct ucred *, NFSPROC_T *, void *); + struct ucred *, NFSPROC_T *); int nfsrpc_copy_file_range(vnode_t, off_t *, vnode_t, off_t *, size_t *, unsigned int, int *, struct nfsvattr *, int *, struct nfsvattr *, struct ucred *, bool, bool *); diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index a27ee1ab034c..8162a9572c75 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -2154,7 +2154,7 @@ nfsmout: */ int nfsrpc_deallocate(vnode_t vp, off_t offs, off_t len, struct nfsvattr *nap, - int *attrflagp, struct ucred *cred, NFSPROC_T *p, void *stuff) + int *attrflagp, struct ucred *cred, NFSPROC_T *p) { int error, expireret = 0, openerr, retrycnt; uint32_t clidrev = 0; @@ -2268,7 +2268,7 @@ int nfsrpc_mknod(vnode_t dvp, char *name, int namelen, struct vattr *vap, u_int32_t rdev, enum vtype vtyp, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, struct nfsvattr *nnap, struct nfsfh **nfhpp, - int *attrflagp, int *dattrflagp, void *dstuff) + int *attrflagp, int *dattrflagp) { u_int32_t *tl; int error = 0; @@ -2348,7 +2348,7 @@ int nfsrpc_create(vnode_t dvp, char *name, int namelen, struct vattr *vap, nfsquad_t cverf, int fmode, struct ucred *cred, NFSPROC_T *p, struct nfsvattr *dnap, struct nfsvattr *nnap, struct nfsfh **nfhpp, - int *attrflagp, int *dattrflagp, void *dstuff) + int *attrflagp, int *dattrflagp) { int error = 0, newone, expireret = 0, retrycnt, unlocked; struct nfsclowner *owp; diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 7c2873c6200f..9b56585a3514 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -1673,7 +1673,7 @@ nfs_mknodrpc(struct vnode *dvp, struct vnode **vpp, struct componentname *cnp, return (error); error = nfsrpc_mknod(dvp, cnp->cn_nameptr, cnp->cn_namelen, vap, rdev, vap->va_type, cnp->cn_cred, curthread, &dnfsva, - &nfsva, &nfhp, &attrflag, &dattrflag, NULL); + &nfsva, &nfhp, &attrflag, &dattrflag); if (!error) { if (!nfhp) (void) nfsrpc_lookup(dvp, cnp->cn_nameptr, @@ -1787,7 +1787,7 @@ again: cverf = nfs_get_cverf(); error = nfsrpc_create(dvp, cnp->cn_nameptr, cnp->cn_namelen, vap, cverf, fmode, cnp->cn_cred, curthread, &dnfsva, &nfsva, - &nfhp, &attrflag, &dattrflag, NULL); + &nfhp, &attrflag, &dattrflag); if (!error) { if (nfhp == NULL) (void) nfsrpc_lookup(dvp, cnp->cn_nameptr, @@ -3845,7 +3845,7 @@ nfs_deallocate(struct vop_deallocate_args *ap) vnode_pager_purge_range(vp, *ap->a_offset, *ap->a_offset + tlen); error = nfsrpc_deallocate(vp, *ap->a_offset, tlen, - &nfsva, &attrflag, ap->a_cred, td, NULL); + &nfsva, &attrflag, ap->a_cred, td); NFSCL_DEBUG(4, "dealloc: rpc=%d\n", error); } if (error == 0) {