From nobody Sun Jun 21 10:16:07 2026 X-Original-To: dev-commits-src-branches@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 4gjnKn39Qgz6jRPF for ; Sun, 21 Jun 2026 10:16: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjnKn05pyz3HtP for ; Sun, 21 Jun 2026 10:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782036973; 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=2HF0AQRC7drLiILt2VCF92j5ZBz7oWnD4oKMTfXwpnk=; b=CUUmesZlEyyCwAdRjt2frbYeje5EnmwK24ISusfGHrm2vLbBa2aiRPc55Vid71ArNLwQL1 7buVazKQ5dJ4mzIc/gDhphYor2klOVM0oEmkmKru5rhb8GTlqqDCigxqDpGctj0HfNHKgx Wsm3CR0MrjqKNo+ZYMpC2e7VhLGbgzVA41b1S0RC9MzlelzwRZ/+BYUl0/hMffATq6u3TH npTkg9rY/9KuHTeY25T3M1fCyMRi7ZdBqvpfPx5Ki7+5MIzWU+VQKc9EhT/bUalEXSj2xZ rto4zXSn3tk/PW1T13ACoJnSVkY3IDNz+HUXEg3ErsTPH20Xg+oP2mKNoXt4tw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782036973; a=rsa-sha256; cv=none; b=AjIv8wvkGHT8NJpg7n7gQ5DXhLm1I0ohGTsuGEvG5yk1Wim++48MQsplCkCrH/mhewW7xK Idsz3SxHXZmHT8bVxeIKR0JL4Bce/xEcEtO0ut6BQyhoSvAD094nWcuMr+ToeJ9gVhvsmu fyRdpqhUAQwBUTQ61cCauTAK3GnDzZ/UceBrkdi4n27MfedDYAQsV9afUvibb6aN6ObeMV 0uyeiCCaQtvCZWePEQx0N6Dr+KfvKdXLUWdUw1os61FL1ZSqnxbcIBKGNPluCzXNTqaJTQ PZi62dCCbebuQJ5kfYdTWH97MeH7UG26D19CZZ5w2S+VGZjxT3VB5sf9tEqcUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782036973; 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=2HF0AQRC7drLiILt2VCF92j5ZBz7oWnD4oKMTfXwpnk=; b=jkVAbORRg4sXsduk6y3YjSqMhEC2CxpM5bzvUybthCOjab3u3Dt6JuE5o9e4t+O8v9iFrK PTPJ7aKD8FUut+XhrGVY64W1Pu+tt0zQqTi16rDQc9wpuAXN0H4Bwxkphwa+N8WwxkWBk2 xeOUPuv3HkXkPBJ3omXvT5KR7RCHsVMBOx5jAL7CP1VoKFulmcYOGElpGkZwOeLoOiQ+GW U0yBECNGxswqmhFCpr9udEd1KGRpZBx5nKp7ulW/V8CNbs04iRnuMcWSJ9GxJhrxBfeZOG e1nDu6mOkCy+h3hh1c17QgewVCEx0TiT4GlLnoj5CojwD43pF6ub2jF0yCanVg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjnKg68nRz1BTY for ; Sun, 21 Jun 2026 10:16:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1d304 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 10:16:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b8044a0ccef0 - stable/15 - vnode: move VIRF_KNOTE to v_v2flag List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b8044a0ccef0700de08951bf98701d1e3890f11a Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 10:16:07 +0000 Message-Id: <6a37b9e7.1d304.a1df67a@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b8044a0ccef0700de08951bf98701d1e3890f11a commit b8044a0ccef0700de08951bf98701d1e3890f11a Author: Konstantin Belousov AuthorDate: 2026-05-09 19:14:56 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-21 10:05:32 +0000 vnode: move VIRF_KNOTE to v_v2flag (cherry picked from commit 64467d2ec3ede11430554fea68b317d27bf4b5c3) --- sys/kern/vfs_subr.c | 5 ++--- sys/sys/mount.h | 4 ++-- sys/sys/vnode.h | 7 ++++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 7cc13be5109a..00795bdd08e7 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6655,7 +6655,7 @@ vfs_knlunlock(void *arg) struct vnode *vp = arg; if (KNLIST_EMPTY(&vp->v_pollinfo->vpi_selinfo.si_note)) - vn_irflag_unset(vp, VIRF_KNOTE); + vp->v_v2flag &= ~V2_KNOTE; VOP_UNLOCK(vp); } @@ -6705,8 +6705,7 @@ vfs_kqfilter(struct vop_kqfilter_args *ap) vhold(vp); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY); knlist_add(knl, kn, 1); - if ((vn_irflag_read(vp) & VIRF_KNOTE) == 0) - vn_irflag_set(vp, VIRF_KNOTE); + vp->v_v2flag |= V2_KNOTE; VOP_UNLOCK(vp); return (0); diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 7e56d4b90b0e..a1e5e4efd460 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -967,7 +967,7 @@ VFS_PURGE(struct mount *mp) static inline void VFS_KNOTE_LOCKED(struct vnode *vp, int hint) { - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { + if ((vp->v_v2flag & V2_KNOTE) != 0) { KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, hint, KNF_LISTLOCKED | KNF_NOKQLOCK); } @@ -976,7 +976,7 @@ VFS_KNOTE_LOCKED(struct vnode *vp, int hint) static inline void VFS_KNOTE_UNLOCKED(struct vnode *vp, int hint) { - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { + if ((vp->v_v2flag & V2_KNOTE) != 0) { KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, hint, KNF_NOKQLOCK); } diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index cf6afe8792b8..0e84127cbc32 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -229,7 +229,7 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define v_object v_bufobj.bo_object #define VN_KNOTE(vp, b, a) do { \ - if ((vn_irflag_read(vp) & VIRF_KNOTE) != 0) { \ + if ((vp->v_v2flag & V2_KNOTE) != 0) { \ KNOTE(&vp->v_pollinfo->vpi_selinfo.si_note, (b), \ (a) | KNF_NOKQLOCK); \ } \ @@ -261,7 +261,8 @@ _Static_assert(sizeof(struct vnode) <= 448, "vnode size crosses 448 bytes"); #define VIRF_INOTIFY 0x0080 /* This vnode is being watched */ #define VIRF_INOTIFY_PARENT 0x0100 /* A parent of this vnode may be being watched */ -#define VIRF_KNOTE 0x0200 /* Has knlist */ + +#define V2_KNOTE 0x0001 /* Has knlist */ #define VI_UNUSED0 0x0001 /* unused */ #define VI_MOUNT 0x0002 /* Mount in progress */ @@ -1064,7 +1065,7 @@ void vop_rename_fail(struct vop_rename_args *ap); off_t osize, ooffset, noffset; \ \ osize = ooffset = noffset = 0; \ - if ((vn_irflag_read((ap)->a_vp) & VIRF_KNOTE) != 0) { \ + if (((ap)->a_vp->v_v2flag & V2_KNOTE) != 0) { \ error = VOP_GETATTR((ap)->a_vp, &va, (ap)->a_cred); \ if (error) \ return (error); \