From nobody Thu Sep 24 18:39:33 2026 X-Original-To: dev-commits-src-all@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 4hrN0k4bSkz6t3S4 for ; Thu, 24 Sep 2026 18:39:34 +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 4hrN0k0yxZz4rnS for ; Thu, 24 Sep 2026 18:39:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275174; 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=1LxTLzTmplAfYtbwHEJdfqZtnhq6F12l72cDbUbEuho=; b=dhWTMdC0eF3xDBb/mEvk60rNOhi+4ILSR0miiTFbc0tqxgd65UFW6CgpsxbvzEd9BuikGz uDOMOaTRGbN5eMxfLsrMzR29gIgvlt5cSGJEoOZxEqApms218AiHAx1qnWDftz1OgcRZki ltF7FqvAQ4T73yRLJnnGP7Yt3FIlNa2hs9ikvwwjUdghWfXRq3fv2nq8hh33qCzFJp+P6S EtdWPdVk0f8zt6DwEZEkaPHfioRYSVrNUyzZkreOE0+5Kpb49N58efHIYIZwNn+v7wQVNE jzgXk0dydVzNc933k5OHmji6UW8KcZwathtmgQSDOD+qEIhWfBYhIOi92O67KQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790275174; b=wJn/c33hjYU+avRHT9hpNX8LXsHSzcJXiAAX2jIW8Wwl475j5kNz0cUU/s5nj8XpAa1q+T 7MTPEto2wh4D9wbbqCyJtjE8Rd9pzGuMVDC5VG9hKTcz/3I8iBMYOnmVbeU9I0yv8x4Ahz akZ+7z2XN4CJfjX5IBb2M/HC7y+c22vcTLWUYpgBvoCSqwekBfNsPOXxGfIPTqwn8/46KB h2aH2G2TxC9po4sy+QYh38Nn/XGcfU6Kx+n6wkMAo9c/Kf/RV7IVyHW553k5V3mVHGy0kA ww0JMTqBTbQodSFuqOI1Q63giPwGNMAE9ba77kLiofS0yVEFRX5oKVlVCz44ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790275174; 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=1LxTLzTmplAfYtbwHEJdfqZtnhq6F12l72cDbUbEuho=; b=f98TX/sbNql+XUpJcbNqCQq/QQBNvzGQygeQYO1dGEu0yh8uHhV2i7t089o76NuKSmM0u1 xBqP7+ekyMpsETTSVzCZg3GqrOJRd+2V2BC0Vvz76RF+ZOxbEollSTriYFkMXyNmjJnxM4 DYTsyfxNxuzDsEcm1BmRIhEG/7qo5GRmD7RSXstJ3542Oa/BMSKgyzz5D43Diky8hGUNCd Qmy+qTnnUfsEYLOvSb985KWOQZjCZ8HW1Mk6Omv7xmam6QXFNP4p4IsN78Am2fInxCCcWP 3RL5lHPIlpThWFXHQ5bwgtLZaOiQEIlB9AoV7jt7u4nMwqenU0B86t/5f8a4Qw== 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 4hrN0j68RdzcjW for ; Thu, 24 Sep 2026 18:39:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24fdb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 24 Sep 2026 18:39:33 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: e40c72c823c6 - main - VFS: style List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e40c72c823c6502906d4024933f0c119b5ca17cf Auto-Submitted: auto-generated Date: Thu, 24 Sep 2026 18:39:33 +0000 Message-Id: <6ab56e65.24fdb.50073ec2@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e40c72c823c6502906d4024933f0c119b5ca17cf commit e40c72c823c6502906d4024933f0c119b5ca17cf Author: Konstantin Belousov AuthorDate: 2026-09-22 16:30:11 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-24 18:38:33 +0000 VFS: style Wrap long lines, related to the nullfs mounts over regular files and sockets type checks. Also fix indent. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 6692ae6facf9..4dd69ee47e82 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3292,7 +3292,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; @@ -5729,7 +5730,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); @@ -5786,7 +5788,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 265e95ee0a75..b784c148ff1d 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1171,12 +1171,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 34f7b32de1b9..7ca82e7e576f 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1044,7 +1044,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);