From nobody Wed Sep 14 18:16:58 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 4MST7Z6SyXz4bmgF; Wed, 14 Sep 2022 18:16:58 +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 4MST7Z5zNSz3XX5; Wed, 14 Sep 2022 18:16:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663179418; 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=iCDSw13TBkf/uJRadA9zv51ZkEgno9clrsrVDchtvfo=; b=Jg3mPEMNlfCGKsXXB3NmpbgFTTAi97VNp7EdwYGSwvTGXFnFDCtEY5U/712pR5qa08xJaZ IrqamTGojl11ouoMN5s+u/SAQKPRUfpLsoPSIdc2cFdMWB70ffwq8XT6FvEjldavYzs1hz VRK7jSdNfRk/Ev8H6A9YzL2uyFGBUF1sGvCr4SrNPiyITGGineWCTx32XDy6EelX31Eh90 A+AYCrhUgtA70EzTbQTrp5Kuc8JW9SHFsJremkqMd1tuSet1K3dBx8a53B6KjLi7NN8iy8 gIFcfBTGl0NPcWlLhKwNZr1ra+aMrq1uk1vPsWPZpbn6RId/CWczXnYAOenXew== 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 4MST7Z536PzlcS; Wed, 14 Sep 2022 18:16:58 +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 28EIGwcL085162; Wed, 14 Sep 2022 18:16:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28EIGw4t085161; Wed, 14 Sep 2022 18:16:58 GMT (envelope-from git) Date: Wed, 14 Sep 2022 18:16:58 GMT Message-Id: <202209141816.28EIGw4t085161@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: a755fb921ed2 - main - vfs: retire the V_MNTREF flag 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: a755fb921ed2b72f369f8664b8b23854d992eec1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663179418; 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=iCDSw13TBkf/uJRadA9zv51ZkEgno9clrsrVDchtvfo=; b=P3fxeUrV6SpBqym+7xKlsw5ibRnzeT3HEGLaIBAwIC0tIusUmFMWPVYqKthR3//2ipWhwZ UWsw5QareZdFpyg8Ih1o/op31/3IRpCDShWkW17Rs8y8GzujCVKecDA8ChAMT6PXbWvn3O aow8wIbGRkIn4zpQaWZ5Ko2z6RtHyCP/Cu4Ia+nyEUsmCMN6HPDIZLFxNexnPTPv+86aEe DENnKr+sw8MtANJsB4rwI8sCyV+hNw6KJmHZl5eQ0Um5Gseu8O9/nJP46hHqsAzMS+vyXY HE00J0d1iYIZRRQttKX+axselZ6kOQHHbVCcOgUlLsSDpIHgCYSK0SGGC0ndIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663179418; a=rsa-sha256; cv=none; b=tYDyq25Np+R+lgx+har8O7irgnDMgtpXxGoCI8H5ru8xidPMXXMDgi03NbxonNdWAMXUT8 iuDoqyQY30EMgqgVqmUGHEDTdoKm8CnSaZhMSYNqQLwMKmqDdU6rZwzYKDIKuL2CiF2snl jQdxR18vFfqMAZTtyy7sYQ887k8Vbz2EspTfEHlrSp1irpW+f8PYKIyVjiqYdzxkLGQdyg 38/QrRZwfkyWjLcWwM8eDzeo73UHbZerxhMVku9psuD/9d9MraWRJR9ss5CVLbSwGbWRb4 i+Z2O3Pag5R+0FBjBUBmMb9VshcYq7iJHlldz2G3OEwA5jjHB4rMAkgPPt9sgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=a755fb921ed2b72f369f8664b8b23854d992eec1 commit a755fb921ed2b72f369f8664b8b23854d992eec1 Author: Mateusz Guzik AuthorDate: 2022-09-10 20:13:19 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-14 18:16:36 +0000 vfs: retire the V_MNTREF flag Reviewed by: kib, mckusick Differential Revision: https://reviews.freebsd.org/D36521 --- sys/kern/vfs_vnops.c | 10 ++-------- sys/sys/vnode.h | 1 - 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 60a1bd7302a2..2e39d8a9e4d2 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1904,9 +1904,6 @@ vn_start_write(struct vnode *vp, struct mount **mpp, int flags) struct mount *mp; int error; - KASSERT((flags & V_MNTREF) == 0 || (*mpp != NULL && vp == NULL), - ("V_MNTREF requires mp")); - error = 0; /* * If a vnode is provided, get and return the mount point that @@ -1930,7 +1927,7 @@ vn_start_write(struct vnode *vp, struct mount **mpp, int flags) * refcount for the provided mountpoint too, in order to * emulate a vfs_ref(). */ - if (vp == NULL && (flags & V_MNTREF) == 0) + if (vp == NULL) vfs_ref(mp); return (vn_start_write_refed(mp, flags, false)); @@ -1949,9 +1946,6 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) struct mount *mp; int error; - KASSERT((flags & V_MNTREF) == 0 || (*mpp != NULL && vp == NULL), - ("V_MNTREF requires mp")); - retry: if (vp != NULL) { if ((error = VOP_GETWRITEMOUNT(vp, mpp)) != 0) { @@ -1976,7 +1970,7 @@ vn_start_secondary_write(struct vnode *vp, struct mount **mpp, int flags) * emulate a vfs_ref(). */ MNT_ILOCK(mp); - if (vp == NULL && (flags & V_MNTREF) == 0) + if (vp == NULL) MNT_REF(mp); if ((mp->mnt_kern_flag & (MNTK_SUSPENDED | MNTK_SUSPEND2)) == 0) { mp->mnt_secondary_writes++; diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index ed292835c12f..30b74fef0902 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -431,7 +431,6 @@ extern int vttoif_tab[]; #define V_WAIT 0x0001 /* vn_start_write: sleep for suspend */ #define V_NOWAIT 0x0002 /* vn_start_write: don't sleep for suspend */ #define V_XSLEEP 0x0004 /* vn_start_write: just return after sleep */ -#define V_MNTREF 0x0010 /* vn_start_write: mp is already ref-ed */ #define VR_START_WRITE 0x0001 /* vfs_write_resume: start write atomically */ #define VR_NO_SUSPCLR 0x0002 /* vfs_write_resume: do not clear suspension */