From nobody Mon Aug 04 22:26:53 2025 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 4bwrl13P9Mz63brk; Mon, 04 Aug 2025 22:26:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bwrl12gc5z3T4P; Mon, 04 Aug 2025 22:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754346413; 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=6X5+oalPawZpU8vEH+DXDVSdomq36SMnwSCxPxpfTPQ=; b=YwYLLErTzbgL/GLYIehJ4VF7YPn7LfTu9Wph1tRYsRc5nKCoKb2zHYuupHIpy6TC0nszb2 b9+y/8MTKRsLabKonp5WLzF1JXm+EZJAYKtlF9slaJypvf+JT5ta0iqvGjS5uo+eDpmRDW XkZq8YYc2YP6cF3DD1ZtEqXYns/ASSDMEI/XcL6cy2Alpm9sGWRrNwrwTUuiT17v/OLjzT nC5s5PJ/NWMOHHZDIMWd+0+0Wp8jL+9SCCqmj3fJwFxu6krByb9Is+0qk2ViP/JntrYVXu tipp7r2hql1PKrX4UJ25E2Q/cPQM7VIOLRi/UvNpHpi5sSqqRQW8B55ykGpADg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754346413; 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=6X5+oalPawZpU8vEH+DXDVSdomq36SMnwSCxPxpfTPQ=; b=Tgv3lucvLvjzfZ7aiQsQ9zkAOa8QeOIHOdLoeFCKkKu8MGYoQearamE2An6saxc4aoiFcw E+eBkQMXLcMxxxbcgnF3fUWwg7c125iZrzGI1ObuB4b31eIZXjrT35thxM++LuE03Xixr4 2AQAgW5eYfmWO1G5lceiFS78ulGV1FWV+47iWWUtIgbqmJGClfMkfAhNF2Pbsl2IjxDUit JTZRetsPl3kxqAeeh2sZ487gXtdPTu+Gue6q1vERvoApTfzv7g2u31fAZpOBH2jkHYkw0y n1rvLBIdDul+6Fm+00+A8OqUerp/a04NsP8ySJZI71XjQiz/5KQmfijzPyakFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754346413; a=rsa-sha256; cv=none; b=K7j5irmgVc8Qcxe9yHF7fdMuE5yzucfxw0b/hOoWRMlGIMs0TqxRN5I1gh+RmEy4VFLBqH AN9Tgae/GIZrvnYMNpJozK7oHCJJAPypf5bm+u67Ey2Z8xZ9C+TZYc44P1LSdDv1ujMHIl cUYFgn5FMkWUKe14QIFof10Lv1zXXUjpGoMfRn+FjTr85JkkAEd7M+YsXYJQHZycO4y8dg hayJmWW5U+vdSdzrnRrvhs6wUVUXM6/y+W4BQweNXy0AkyOxcpgmTmRoSOTqpTrGHyBccW A1keMisJUEt5fIclRz8Ro3aPjCzAy10V2aOhls1NChSC1ByJUi/cR0OGMh7m3Q== 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 4bwrl11s6Qz16gd; Mon, 04 Aug 2025 22:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 574MQrRc000822; Mon, 4 Aug 2025 22:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 574MQr4f000819; Mon, 4 Aug 2025 22:26:53 GMT (envelope-from git) Date: Mon, 4 Aug 2025 22:26:53 GMT Message-Id: <202508042226.574MQr4f000819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: fd50bb3f7cd0 - main - vop_fsync_debugprepost(): take account of nullfs 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org 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/main X-Git-Reftype: branch X-Git-Commit: fd50bb3f7cd0762755ba6bf12d506da2544d4756 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fd50bb3f7cd0762755ba6bf12d506da2544d4756 commit fd50bb3f7cd0762755ba6bf12d506da2544d4756 Author: Konstantin Belousov AuthorDate: 2025-08-04 20:12:28 +0000 Commit: Konstantin Belousov CommitDate: 2025-08-04 22:26:25 +0000 vop_fsync_debugprepost(): take account of nullfs Reported by: netchild Reviewed and tested by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51730 --- sys/kern/vfs_subr.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4eac8bb0c8bb..a6e38be89291 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -5897,6 +5897,8 @@ vop_fplookup_symlink_debugpost(void *ap __unused, int rc __unused) static void vop_fsync_debugprepost(struct vnode *vp, const char *name) { + struct mount *mp; + if (vp->v_type == VCHR) ; /* @@ -5914,10 +5916,16 @@ vop_fsync_debugprepost(struct vnode *vp, const char *name) * should still be caught when the stacked filesystem * invokes VOP_FSYNC() on the underlying filesystem. */ - else if (MNT_SHARED_WRITES(vp->v_mount)) - ASSERT_VOP_LOCKED(vp, name); - else - ASSERT_VOP_ELOCKED(vp, name); + else { + mp = NULL; + VOP_GETWRITEMOUNT(vp, &mp); + if (vn_lktype_write(mp, vp) == LK_SHARED) + ASSERT_VOP_LOCKED(vp, name); + else + ASSERT_VOP_ELOCKED(vp, name); + if (mp != NULL) + vfs_rel(mp); + } } void