From nobody Mon Dec 19 08:14:37 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 4NbCDF5CRcz1G1Ny; Mon, 19 Dec 2022 08:14:37 +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 4NbCDF4mRnz3M9n; Mon, 19 Dec 2022 08:14:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671437677; 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=fmQ7iAKKWhgdfLDkaAOv0l2XA2WiV5p5JnVSaJf4UVM=; b=kmBPhLuhu5tX2/ASDj8rxS5olhkiGgGyH5YQudqQOtKrC2WqmRG8Aq05NPxywUvdOZsv80 QYsJYSNAfLfbzsOXElG0pVAEeitEVEDQWf7a9tBXTvDxMaosJSHDXwWwhJLuc4wyQbC57z ryILT4IlGj6UBtA/+W3oSnmotXvhgUwE8VOp8cmGt4fdfJyFOWAH51KK0o9hgudbvshJ7w fxhFLc5WcvmS/7v/Xr+eqVh1/KwFhyYvMFoO18JCVwJLsqnv3mRyPi8VHPuX3Q6ZpBx+24 fPnShKgjh76PMg8I4XDvnBdWaAhsjaliwH1wdWEy5nn2wPoMo8yXA9X1+9/+Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671437677; 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=fmQ7iAKKWhgdfLDkaAOv0l2XA2WiV5p5JnVSaJf4UVM=; b=rH1m6Z5x9aY83XPczaweF0/W/cfvVkGtbBZ9ScOM/fZNZOXxetaXqHl4bAWLds/adOvB2M pRQIdH6+OFErxvFRL6B+Bgki2Jv04faXrIs/BQnnTTcbmfDROgHrnsVnOkXIvOcrPJubc+ 5VvujV/uNWgx1QUQZFdu0CBy1AqoIFPsZTlXjvIXDi9WubLklsjfMZ9w7hs/Hix2W3f++m V/stv3XAc5mWf0yFox4IxWJ7ZV5bd6IZ17uED77uW9tMQQ1mBfFmkqltG/iqSM8uIPX2kJ mJapY325Uma6ZIpPsF0Ydb99dp5ktRGEpHicktdljZAugTz5kt0ZarGy9FK1tQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671437677; a=rsa-sha256; cv=none; b=PJfKvLJJd1YnKEXmlqZUm1TA/OVEI3gyrnJu+g+Q3E8ht/Z7G3QgFTe4bMCatkzRjz19cF KM01vlfqmeQkNTGgS9/F+hEcFvk8CNLyIcs82tYtiTBPikQgvp6h8+jDj53S5COXdO/+Ks STUPrg1a4KCtJSBaPJFZx0kurismvMTTmaQUyjy4C9X0FOiJ3cbQH60JwWLfcLnqKqA3l5 QRBknWJkhoAmcIp5kcIftUAaLZ4W+jcfJZDIN6OnCxgriKNx8cdUsyn9A14T+wtwzjHx8c z+HyfUdipIrt1sN2OubIGUYnyvpLfTKhAeuZzv8lw1KOUc9Joa4xOQfj11KgwQ== 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 4NbCDF3hJgzpY1; Mon, 19 Dec 2022 08:14:37 +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 2BJ8Ebqj052932; Mon, 19 Dec 2022 08:14:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BJ8EbYn052931; Mon, 19 Dec 2022 08:14:37 GMT (envelope-from git) Date: Mon, 19 Dec 2022 08:14:37 GMT Message-Id: <202212190814.2BJ8EbYn052931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 85dac03e30e6 - main - vfs: stop using NDFREE 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85dac03e30e6aebdf0808cd750cc5ab96efcb67c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=85dac03e30e6aebdf0808cd750cc5ab96efcb67c commit 85dac03e30e6aebdf0808cd750cc5ab96efcb67c Author: Mateusz Guzik AuthorDate: 2022-11-17 16:58:28 +0000 Commit: Mateusz Guzik CommitDate: 2022-12-19 08:07:23 +0000 vfs: stop using NDFREE It provides nothing but a branchfest and next to no consumers want it anyway. Tested by: pho --- sys/kern/vfs_acl.c | 11 +++++++---- sys/kern/vfs_cache.c | 4 +++- sys/kern/vfs_extattr.c | 8 +++++--- sys/kern/vfs_subr.c | 3 ++- sys/security/mac/mac_syscalls.c | 7 ++++--- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_acl.c b/sys/kern/vfs_acl.c index dffce9d29291..e5470bd11438 100644 --- a/sys/kern/vfs_acl.c +++ b/sys/kern/vfs_acl.c @@ -380,7 +380,8 @@ kern___acl_get_path(struct thread *td, const char *path, acl_type_t type, error = namei(&nd); if (error == 0) { error = vacl_get_acl(td, nd.ni_vp, type, aclp); - NDFREE(&nd, 0); + vrele(nd.ni_vp); + NDFREE_PNBUF(&nd); } return (error); } @@ -418,7 +419,8 @@ kern___acl_set_path(struct thread *td, const char *path, error = namei(&nd); if (error == 0) { error = vacl_set_acl(td, nd.ni_vp, type, aclp); - NDFREE(&nd, 0); + vrele(nd.ni_vp); + NDFREE_PNBUF(&nd); } return (error); } @@ -494,7 +496,8 @@ kern___acl_delete_path(struct thread *td, const char *path, error = namei(&nd); if (error == 0) { error = vacl_delete(td, nd.ni_vp, type); - NDFREE(&nd, 0); + vrele(nd.ni_vp); + NDFREE_PNBUF(&nd); } return (error); } @@ -551,7 +554,7 @@ kern___acl_aclcheck_path(struct thread *td, const char *path, acl_type_t type, error = namei(&nd); if (error == 0) { error = vacl_aclcheck(td, nd.ni_vp, type, aclp); - NDFREE(&nd, 0); + NDFREE_PNBUF(&nd); } return (error); } diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index e58d3f338085..08d7ab2895cd 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3153,7 +3153,9 @@ kern___realpathat(struct thread *td, int fd, const char *path, char *buf, error = copyout(retbuf, buf, size); free(freebuf, M_TEMP); } - NDFREE(&nd, 0); + vrele(nd.ni_vp); + vrele(nd.ni_dvp); + NDFREE_PNBUF(&nd); return (error); } diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c index d389b33d0634..d190ec60205a 100644 --- a/sys/kern/vfs_extattr.c +++ b/sys/kern/vfs_extattr.c @@ -108,7 +108,7 @@ sys_extattrctl(struct thread *td, struct extattrctl_args *uap) if (error) return (error); filename_vp = nd.ni_vp; - NDFREE(&nd, NDF_NO_VP_RELE); + NDFREE_PNBUF(&nd); } /* uap->path is always defined. */ @@ -120,13 +120,15 @@ sys_extattrctl(struct thread *td, struct extattrctl_args *uap) mp = nd.ni_vp->v_mount; error = vfs_busy(mp, 0); if (error) { - NDFREE(&nd, 0); + vput(nd.ni_vp); + NDFREE_PNBUF(&nd); mp = NULL; goto out; } VOP_UNLOCK(nd.ni_vp); error = vn_start_write(nd.ni_vp, &mp_writable, V_WAIT | V_PCATCH); - NDFREE(&nd, NDF_NO_VP_UNLOCK); + vrele(nd.ni_vp); + NDFREE_PNBUF(&nd); if (error) goto out; if (filename_vp != NULL) { diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4aea0f263e46..63a30cbbdb3d 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -415,7 +415,8 @@ sysctl_try_reclaim_vnode(SYSCTL_HANDLER_ARGS) counter_u64_add(recycles_count, 1); vgone(vp); putvnode: - NDFREE(&nd, 0); + vput(vp); + NDFREE_PNBUF(&nd); out: free(buf, M_TEMP); return (error); diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index 9bc334686aa4..ecb451ac2018 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -369,7 +369,8 @@ kern___mac_get_path(struct thread *td, const char *path_p, struct mac *mac_p, mac_vnode_copy_label(nd.ni_vp->v_label, intlabel); error = mac_vnode_externalize_label(intlabel, elements, buffer, mac.m_buflen); - NDFREE(&nd, 0); + vput(nd.ni_vp); + NDFREE_PNBUF(&nd); mac_vnode_label_free(intlabel); if (error == 0) @@ -542,9 +543,9 @@ kern___mac_set_path(struct thread *td, const char *path_p, struct mac *mac_p, td->td_ucred); vn_finished_write(mp); } + vput(nd.ni_vp); + NDFREE_PNBUF(&nd); } - - NDFREE(&nd, 0); out: mac_vnode_label_free(intlabel); return (error);