From nobody Thu Oct 01 01:17:19 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 4hwDXw0dDrz6tcKF for ; Thu, 01 Oct 2026 01:17:20 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hwDXv5x7Rz4b2X for ; Thu, 01 Oct 2026 01:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790817439; 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=5RWDMl3stWOCCaVv39g++H41l1c+S07XdSX0CJlczm0=; b=EW7fEkyDY4b/k9WvJNyR95k6x1OZG95aoptyGRLssOliA+zKvtlKIpC+ENxISfMaANTJFp pvFWonGSGx5UoAGdjrr8bZgpCspjjx/AeA/RLifJbIfCd1VX4mRPA9Ip/Hr/hrgEoxJPKL p8G0roFzRtgXSk4A0Viw4FudWB0ZpmMrDO1wgz3MTZFHRLux2l1rQpifPr9NKURvP+rZ+h 319SanoaUDpSmw1D2suWNDQtfGL1KOAnUm3zank0yHEgV61RwqQnGwRTPt+iCb/sBkLTxx zMViv3KQdKV25zOeAn8iyTMBQQx181V4E1ZuwSRzOWaOSeOoWleSBnxTmexkfQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790817439; b=mwJZQykWKBen6rGNu3P1IDQBhf9UBA+PiBWdA8T78yMFM2B3W5lDpDE/ARcWC3dS0QedU9 bsx9FetQqoPuecDnj9nNYClVccahPpZBpnAxnWhIKbcCS/cbfqa8Zqhcsbfls7GM8xxW5Y zz6YE15SXaeuyhSfOkQvO6dqfIY0REHdmSXE7PN+3qKEniNEjPqZVlI11wnw0zW4j3AwYo oPFmzGEWL5rntv4qyqQLCtjVyVZ9jcq2sY9FwnZuS0+2AiffXURAYmqnst9Moq5J0lKrF/ YRRjaFpJRvOCmlTCqYYeTpiqB/2X/g105x/hixCMHfI6jlaNGFuyQJj0TlUtVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790817439; 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=5RWDMl3stWOCCaVv39g++H41l1c+S07XdSX0CJlczm0=; b=Hv0flMj3aDmKHbUkxwgZCz+c36W7JgPu5kZiSH5dZsjIcT7ezfvS86TBv1Mjy3axCzNlBR w82pVeaLiDdsyKspkJvJE5bUfljUY1kaUDMME87aSSt/L89mgT5JgPDAHCX2PORK7NLUwA 7z7EDvYLFH3tgnULxA9aPY58LLKI33veMkMfmzGE/Mo/2onpzrlVjceNnLzG/0Hzap+xUU jwDbBikPqbUatJVPPQVcCjOmHlkQOhRa2RSnt8MxaA76jAQOX/9WbJ7bVVUGM69OkcLewf ma16vHc0r2CyCEY0Z2LKrfIJimFaxSuYTdL3JfQizW7u0CHna+zv+Q+0shxZwg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hwDXv4kb0z194q for ; Thu, 01 Oct 2026 01:17:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f94b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 01 Oct 2026 01:17:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: a30ea6460ac6 - stable/15 - VFS: style 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: a30ea6460ac63110312030db5f0a372eeb4507b6 Auto-Submitted: auto-generated Date: Thu, 01 Oct 2026 01:17:19 +0000 Message-Id: <6abdb49f.1f94b.32f7e37f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=a30ea6460ac63110312030db5f0a372eeb4507b6 commit a30ea6460ac63110312030db5f0a372eeb4507b6 Author: Konstantin Belousov AuthorDate: 2026-09-22 16:30:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-30 21:37:19 +0000 VFS: style (cherry picked from commit e40c72c823c6502906d4024933f0c119b5ca17cf) --- sys/fs/nullfs/null_vfsops.c | 3 ++- sys/kern/vfs_cache.c | 9 ++++++--- sys/kern/vfs_mount.c | 6 ++++-- sys/kern/vfs_subr.c | 2 +- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index b3fd266c7fe0..6f78ace22bba 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -175,7 +175,8 @@ nullfs_mount(struct mount *mp) * Lower vnode must be the same type as the covered vnode - we * don't allow mounting directories to files or vice versa. */ - if ((lowerrootvp->v_type != VDIR && lowerrootvp->v_type != VREG && lowerrootvp->v_type != VSOCK) || + if ((lowerrootvp->v_type != VDIR && lowerrootvp->v_type != VREG && + lowerrootvp->v_type != VSOCK) || lowerrootvp->v_type != mp->mnt_vnodecovered->v_type) { NULLFSDEBUG("nullfs_mount: target must be same type as fspath"); vput(lowerrootvp); diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 524fc51421d3..5a83a137b5bf 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3268,7 +3268,8 @@ kern___realpathat(struct thread *td, int fd, const char *path, char *buf, if ((error = namei(&nd)) != 0) return (error); - if ((nd.ni_vp->v_type == VREG || nd.ni_vp->v_type == VSOCK) && nd.ni_dvp->v_type != VDIR && + if ((nd.ni_vp->v_type == VREG || nd.ni_vp->v_type == VSOCK) && + nd.ni_dvp->v_type != VDIR && (nd.ni_vp->v_vflag & VV_ROOT) != 0) { struct vnode *covered_vp; @@ -5705,7 +5706,8 @@ cache_fplookup_climb_mount(struct cache_fpl *fpl) vp = fpl->tvp; vp_seqc = fpl->tvp_seqc; - VNPASS(vp->v_type == VDIR || vp->v_type == VREG || vp->v_type == VSOCK || vp->v_type == VBAD, vp); + VNPASS(vp->v_type == VDIR || vp->v_type == VREG || + vp->v_type == VSOCK || vp->v_type == VBAD, vp); mp = atomic_load_ptr(&vp->v_mountedhere); if (__predict_false(mp == NULL)) { return (0); @@ -5762,7 +5764,8 @@ cache_fplookup_cross_mount(struct cache_fpl *fpl) vp = fpl->tvp; vp_seqc = fpl->tvp_seqc; - VNPASS(vp->v_type == VDIR || vp->v_type == VREG || vp->v_type == VSOCK || vp->v_type == VBAD, vp); + VNPASS(vp->v_type == VDIR || vp->v_type == VREG || + vp->v_type == VSOCK || vp->v_type == VBAD, vp); mp = atomic_load_ptr(&vp->v_mountedhere); if (__predict_false(mp == NULL)) { return (0); diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 77119e5ed655..4a0d043344bc 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1155,12 +1155,14 @@ vfs_domount_first( if (error == 0) error = vinvalbuf(vp, V_SAVE, 0, 0); if (vfsp->vfc_flags & VFCF_FILEMOUNT) { - if (error == 0 && vp->v_type != VDIR && vp->v_type != VREG && vp->v_type != VSOCK) + if (error == 0 && vp->v_type != VDIR && vp->v_type != VREG && + vp->v_type != VSOCK) error = EINVAL; /* * For file mounts, ensure that there is only one hardlink to the file. */ - if (error == 0 && (vp->v_type == VREG || vp->v_type == VSOCK) && va.va_nlink != 1) + if (error == 0 && (vp->v_type == VREG || vp->v_type == VSOCK) && + va.va_nlink != 1) error = EINVAL; } else { if (error == 0 && vp->v_type != VDIR) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index b11ae42eb1a7..cf56f992a854 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1040,7 +1040,7 @@ vfs_busyfs(fsid_t *fsid) if (fsidcmp(&mp->mnt_stat.f_fsid, fsid) == 0) return (mp); else - vfs_unbusy(mp); + vfs_unbusy(mp); slow: mtx_lock(&mountlist_mtx);