From owner-dev-commits-src-all@freebsd.org Mon Jun 7 00:40:13 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DCC0564343A; Mon, 7 Jun 2021 00:40:13 +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 4FyvfP4nb9z4r7s; Mon, 7 Jun 2021 00:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 891CD53C4; Mon, 7 Jun 2021 00:40:13 +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 1570eDFf063286; Mon, 7 Jun 2021 00:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1570eD36063282; Mon, 7 Jun 2021 00:40:13 GMT (envelope-from git) Date: Mon, 7 Jun 2021 00:40:13 GMT Message-Id: <202106070040.1570eD36063282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Guzik Subject: git: b1203ecc7bb5 - stable/13 - vfs: retire unused vn_seqc_write_begin_unheld* 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/stable/13 X-Git-Reftype: branch X-Git-Commit: b1203ecc7bb520b9ea2d4fac97439948317e4768 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Jun 2021 00:40:14 -0000 The branch stable/13 has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=b1203ecc7bb520b9ea2d4fac97439948317e4768 commit b1203ecc7bb520b9ea2d4fac97439948317e4768 Author: Mateusz Guzik AuthorDate: 2021-05-29 02:26:19 +0000 Commit: Mateusz Guzik CommitDate: 2021-06-07 00:34:54 +0000 vfs: retire unused vn_seqc_write_begin_unheld* (cherry picked from commit 3cf75ca220fb6a9006fa0481b97e154602f6f554) --- sys/kern/vfs_subr.c | 21 ++------------------- sys/sys/vnode.h | 2 -- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 3e6d11624197..bd4413edcb40 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6824,25 +6824,17 @@ vn_dir_check_exec(struct vnode *vp, struct componentname *cnp) * to prevent the vnode from getting freed. */ void -vn_seqc_write_begin_unheld_locked(struct vnode *vp) +vn_seqc_write_begin_locked(struct vnode *vp) { ASSERT_VI_LOCKED(vp, __func__); + VNPASS(vp->v_holdcnt > 0, vp); VNPASS(vp->v_seqc_users >= 0, vp); vp->v_seqc_users++; if (vp->v_seqc_users == 1) seqc_sleepable_write_begin(&vp->v_seqc); } -void -vn_seqc_write_begin_locked(struct vnode *vp) -{ - - ASSERT_VI_LOCKED(vp, __func__); - VNPASS(vp->v_holdcnt > 0, vp); - vn_seqc_write_begin_unheld_locked(vp); -} - void vn_seqc_write_begin(struct vnode *vp) { @@ -6852,15 +6844,6 @@ vn_seqc_write_begin(struct vnode *vp) VI_UNLOCK(vp); } -void -vn_seqc_write_begin_unheld(struct vnode *vp) -{ - - VI_LOCK(vp); - vn_seqc_write_begin_unheld_locked(vp); - VI_UNLOCK(vp); -} - void vn_seqc_write_end_locked(struct vnode *vp) { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index d26c8aa70d8e..f492b3389d0e 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -785,8 +785,6 @@ int vn_io_fault_uiomove(char *data, int xfersize, struct uio *uio); int vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, int xfersize, struct uio *uio); -void vn_seqc_write_begin_unheld_locked(struct vnode *vp); -void vn_seqc_write_begin_unheld(struct vnode *vp); void vn_seqc_write_begin_locked(struct vnode *vp); void vn_seqc_write_begin(struct vnode *vp); void vn_seqc_write_end_locked(struct vnode *vp);