From nobody Fri Jun 17 23:48:05 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 CC2F983A577; Fri, 17 Jun 2022 23:48:05 +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 4LPwhj5FDLz3sc8; Fri, 17 Jun 2022 23:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655509685; 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=z/4G3snATEAqkihc7AlB7L6TpjsSjCru4jhvh4wsJM0=; b=BT6L4sRhYZ45tiPEO1j4GMYYb9zMCsAqY6Iia7soYvf2Lw3CvDJzc8HfDsS4KBJ1Pf2W17 6BnNUrs2vKf8ClBuUyLYXcPPyl5ToqmGid3cZqyE7CnVTlO5iUtXRiuNbZVKsTirkdvZqJ oWzN2bUD0bPpkTNI0BFcyHOb65jC5cdS1it8Ro9Ijfp3cJF//6Zd24+rHot7ihB8nCSSrj LfTaadW0xE5nmf7bKTYuPpU147cyZjOMDvRmJC2OQ+ppl5s55dSDj7Tx7Gv3PBnqIrs9np stdn+XGdQB22i6k0p/IuoJwmLj5DsUYEoyzUG4cE3VK2pJzG/6yaupnPpHdfbg== 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 90309149F; Fri, 17 Jun 2022 23:48:05 +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 25HNm5ou058066; Fri, 17 Jun 2022 23:48:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HNm5LQ058065; Fri, 17 Jun 2022 23:48:05 GMT (envelope-from git) Date: Fri, 17 Jun 2022 23:48:05 GMT Message-Id: <202206172348.25HNm5LQ058065@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: 3c4266eda1a3 - 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: 3c4266eda1a3bbf525821f8c0a33f6b035edc123 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655509685; 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=z/4G3snATEAqkihc7AlB7L6TpjsSjCru4jhvh4wsJM0=; b=eG6NMPfQ8obSMhcBZD7b21p/o/eVXpF/ezIK2f33ZhdxllvuTUodumjFXRaGItui/biTZ5 hncqj1KphDq5xOSgXeMRJpQUWaBCcIv+nnYBvVkLsUVRxR5Y/ZMcLG7YyO+Tx3m7P+V3Qd F3z8FCrcDsTvsChwxCw2wKXMfMu/kXxwHBmadCbADC1sgZFZLkBQx3qc3IDjpattzIAaxF JpdbCa7CM6n6KC9GtgRleOYrlF1rxgH2/QSMpQrMddtYgaOchzwaMCuGpkQFsiGpqNDx3f wEMmiHRzkqj2BZOjfgDqf4+9BfCODCqysOzqgiacaWiHrDUfeY0ipu7sVh5xtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655509685; a=rsa-sha256; cv=none; b=Lj8dakgKK78Eu0uxG/ZAxAnYUGKQfTuALfFLABvWaFB38KJPP6kGCQBPb3jO9qaOTw13Rl c8Va4UF/vtSBcbSwy0hpcEH8Jvza6HaAbNmcJSH26sx7xuWm0eWvCZrDc2WMd9wkFEc8c1 ETfbeDcnlTRLAiv0wUbcuNNDXN06Vco70t3ZDZcLok00KtdRA185US4aDs4GY9Ngqp1lmG qJ9Y9fyq30LuDjxlMPQrFRgCmZbvSBvL+b9hj+ge5G4kimGdJ945+87fkyjS4FUPyn/Fq1 xAKcDMz3OJVSpcDdfcEzMLlZxXCZfTarnNLbEl6hzPA3xqY7NYV/I8u5RA+slA== 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=3c4266eda1a3bbf525821f8c0a33f6b035edc123 commit 3c4266eda1a3bbf525821f8c0a33f6b035edc123 Author: Rick Macklem AuthorDate: 2022-06-17 23:46:11 +0000 Commit: Rick Macklem CommitDate: 2022-06-17 23:46:11 +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 and nfs_clstate.c. This commit should not result in a semantics change. --- sys/fs/nfs/nfs_var.h | 4 ++-- sys/fs/nfsclient/nfs_clrpcops.c | 13 ++++++------- sys/fs/nfsclient/nfs_clstate.c | 2 +- sys/fs/nfsclient/nfs_clvnops.c | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index 07848a963763..5f2cf9fa5948 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -537,7 +537,7 @@ int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *, struct nfscldevinfo **, struct ucred *, NFSPROC_T *); int nfsrpc_layoutcommit(struct nfsmount *, uint8_t *, int, int, uint64_t, uint64_t, uint64_t, nfsv4stateid_t *, int, struct ucred *, - NFSPROC_T *, void *); + NFSPROC_T *); int nfsrpc_layoutreturn(struct nfsmount *, uint8_t *, int, int, int, uint32_t, int, uint64_t, uint64_t, nfsv4stateid_t *, struct ucred *, NFSPROC_T *, uint32_t, uint32_t, char *); @@ -549,7 +549,7 @@ int nfscl_findlayoutforio(struct nfscllayout *, uint64_t, uint32_t, struct nfsclflayout **); void nfscl_freenfsclds(struct nfsclds *); int nfsrpc_allocate(vnode_t, off_t, off_t, struct nfsvattr *, int *, - struct ucred *, NFSPROC_T *, void *); + struct ucred *, NFSPROC_T *); int nfsrpc_deallocate(vnode_t, off_t, off_t, struct nfsvattr *, int *, struct ucred *, NFSPROC_T *); int nfsrpc_copy_file_range(vnode_t, off_t *, vnode_t, off_t *, size_t *, diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 0f1e64d019bb..3e66bf93e4fc 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -219,7 +219,7 @@ static int nfsrpc_createlayout(vnode_t, char *, int, struct vattr *, int, int, int, int *, struct nfsclflayouthead *, int *); static int nfsrpc_layoutget(struct nfsmount *, uint8_t *, int, int, uint64_t, uint64_t, uint64_t, int, int, nfsv4stateid_t *, int *, - struct nfsclflayouthead *, struct ucred *, NFSPROC_T *, void *); + struct nfsclflayouthead *, struct ucred *, NFSPROC_T *); static int nfsrpc_layoutgetres(struct nfsmount *, vnode_t, uint8_t *, int, nfsv4stateid_t *, int, uint32_t *, struct nfscllayout **, struct nfsclflayouthead *, int, int, int *, struct ucred *, NFSPROC_T *); @@ -5355,8 +5355,7 @@ static int nfsrpc_layoutget(struct nfsmount *nmp, uint8_t *fhp, int fhlen, int iomode, uint64_t offset, uint64_t len, uint64_t minlen, int layouttype, int layoutlen, nfsv4stateid_t *stateidp, int *retonclosep, - struct nfsclflayouthead *flhp, struct ucred *cred, NFSPROC_T *p, - void *stuff) + struct nfsclflayouthead *flhp, struct ucred *cred, NFSPROC_T *p) { struct nfsrv_descript nfsd, *nd = &nfsd; int error; @@ -5620,7 +5619,7 @@ nfsmout: int nfsrpc_layoutcommit(struct nfsmount *nmp, uint8_t *fh, int fhlen, int reclaim, uint64_t off, uint64_t len, uint64_t lastbyte, nfsv4stateid_t *stateidp, - int layouttype, struct ucred *cred, NFSPROC_T *p, void *stuff) + int layouttype, struct ucred *cred, NFSPROC_T *p) { uint32_t *tl; struct nfsrv_descript nfsd, *nd = &nfsd; @@ -5834,7 +5833,7 @@ nfsrpc_getlayout(struct nfsmount *nmp, vnode_t vp, struct nfsfh *nfhp, error = nfsrpc_layoutget(nmp, nfhp->nfh_fh, nfhp->nfh_len, iomode, (uint64_t)0, UINT64_MAX, (uint64_t)0, layouttype, layoutlen, &stateid, - &retonclose, &flh, cred, p, NULL); + &retonclose, &flh, cred, p); } else { islocked = 1; stateid.seqid = lyp->nfsly_stateid.seqid; @@ -5844,7 +5843,7 @@ nfsrpc_getlayout(struct nfsmount *nmp, vnode_t vp, struct nfsfh *nfhp, error = nfsrpc_layoutget(nmp, nfhp->nfh_fh, nfhp->nfh_len, iomode, off, UINT64_MAX, (uint64_t)0, layouttype, layoutlen, &stateid, - &retonclose, &flh, cred, p, NULL); + &retonclose, &flh, cred, p); } error = nfsrpc_layoutgetres(nmp, vp, nfhp->nfh_fh, nfhp->nfh_len, &stateid, retonclose, notifybitsp, &lyp, @@ -7382,7 +7381,7 @@ nfsio_adviseds(vnode_t vp, uint64_t offset, int cnt, int advise, */ int nfsrpc_allocate(vnode_t vp, off_t off, 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, retrycnt, nostateid; uint32_t clidrev = 0; diff --git a/sys/fs/nfsclient/nfs_clstate.c b/sys/fs/nfsclient/nfs_clstate.c index 7a0d323a788a..10ce1296f652 100644 --- a/sys/fs/nfsclient/nfs_clstate.c +++ b/sys/fs/nfsclient/nfs_clstate.c @@ -5808,7 +5808,7 @@ nfscl_dolayoutcommit(struct nfsmount *nmp, struct nfscllayout *lyp, error = nfsrpc_layoutcommit(nmp, lyp->nfsly_fh, lyp->nfsly_fhlen, 0, flp->nfsfl_off, len, lyp->nfsly_lastbyte, &lyp->nfsly_stateid, - layouttype, cred, p, NULL); + layouttype, cred, p); NFSCL_DEBUG(4, "layoutcommit err=%d\n", error); if (error == NFSERR_NOTSUPP) { /* If not supported, don't bother doing it. */ diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 36037c021e4e..d72c2542f32f 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -3763,7 +3763,7 @@ nfs_allocate(struct vop_allocate_args *ap) error = ncl_flush(vp, MNT_WAIT, td, 1, 0); if (error == 0) error = nfsrpc_allocate(vp, *ap->a_offset, alen, - &nfsva, &attrflag, ap->a_cred, td, NULL); + &nfsva, &attrflag, ap->a_cred, td); if (error == 0) { *ap->a_offset += alen; *ap->a_len -= alen;