From nobody Sat Apr 27 14:58:46 2024 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 4VRXm659HBz5JH8V; Sat, 27 Apr 2024 14:58:46 +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 4VRXm64WVvz4321; Sat, 27 Apr 2024 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714229926; 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=oidC/Nk0wE/UVZpOic7/TX5UL/TQ9It8olMgCtPtJU4=; b=HdlPUoiEo/qUI5N8VwfmLXzzOqCoIgw8uISCemnpi18ciMtpKKnvLZgSuEhNEPpt6g82Ep No/EPxIhdwvD2T8S1mHUUMfO2qzj9Rh/sHF1DpJeDXVOQEPBlXKVLs3q9JtNxPGitsWbnu HTS4vicShnCm4TNnt43gn9Z6W3m3R7t9q7U1qF5MsTVmwQLTYuAo/f5FE32Xi9M+1S/jRx uccFJvVPQiQmI6BYlYsgxj1mX4lsk1qnN2uZqzTthQwyV45aq1exrRu36R7TkHHWn6u8DE Vwu3uAEG2NVG2YNB4BmJ7I8HDEryAIg3kXHs6S/dYxmr+r3bJIvGL/TCbOmKCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714229926; a=rsa-sha256; cv=none; b=ASZ+mVmWc6M7ivyVzm2Bj/ESOvYqJEmZFEh2CDozl4BR2cQFaUgUoAn99zNGtffysv3yv6 RlOX4eedj5aa8iNDET2yj6nH65kTk9OVy/DMfO1OmB5TDqnDAbK20Fi7Lz3Aqz6j2/oSf+ +ZpdCuMgJGanN/tPF0FSXKc+hKHGZWfHwptjnwQhbRIaof7vedIyie6VJ6njSGLvlt9BkW AA7PKMRHg7a4S4HHuYWQTg86kEDk/knwzKaT1pNHnBF9LOpZyZv0REAjjF9fqEQltd+7fu busuihbArQPlp5fft0zMRzKDQsxg6sfaKOU8SBxnchv66kqvIF7w4uW3h0BwRA== 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=1714229926; 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=oidC/Nk0wE/UVZpOic7/TX5UL/TQ9It8olMgCtPtJU4=; b=aiFsnX1LTJjf+Ukt1EPg89pMKpTPwGpFd7nj/8tK5B5KuSAwFQa48NAtUTA/wXXu7wlHBv OcJDsC/hqypM/3Ym5t8/UxkGksonpX3Xf2kkJ2HRQQHoN6Cn0nU4ySJTIXibJVsJoHGh6u LSLjPJdpeLFSCTCInV7BD1O4FT0i1y+xlC/bZExy6SaogeceySnjNGXkfHW9mw26uBiH6S 2a+ACZdQuGhHztahcRDdrTt7sKLc5feLQCX1PK704JDXMkD3DL1LqPOq5+gbeEsD7BKidP sq/ES2JTtdBP3v2mjJksJUXM3vSCzbLSV04UV0K/SCemtOgrLkN+4y5WUCG6+w== 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 4VRXm646dszX4x; Sat, 27 Apr 2024 14:58:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43REwkOY032528; Sat, 27 Apr 2024 14:58:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43REwkkr032525; Sat, 27 Apr 2024 14:58:46 GMT (envelope-from git) Date: Sat, 27 Apr 2024 14:58:46 GMT Message-Id: <202404271458.43REwkkr032525@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 82c8a5f4f18c - stable/13 - nullfs: Show correct exported flag. 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 commit 82c8a5f4f18c72b3be34f182b0509a133e4f3fb4 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-27 14:58:40 +0000 nullfs: Show correct exported flag. MFC after: 3 days Reviewed by: allanjude, kib Differential Revision: https://reviews.freebsd.org/D44773 (cherry picked from commit 2b258dd17caf329bc549f93d9858b74109a479d7) --- sys/fs/nullfs/null_vfsops.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index 271f5bf249fc..01ab822de087 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -336,9 +336,10 @@ nullfs_statfs(struct mount *mp, struct statfs *sbp) /* now copy across the "interesting" information and fake the rest */ sbp->f_type = mstat->f_type; - sbp->f_flags = (sbp->f_flags & (MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | - MNT_UNION | MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_IGNORE)) | - (mstat->f_flags & ~(MNT_ROOTFS | MNT_AUTOMOUNTED)); + sbp->f_flags &= MNT_RDONLY | MNT_NOEXEC | MNT_NOSUID | MNT_UNION | + MNT_NOSYMFOLLOW | MNT_AUTOMOUNTED | MNT_EXPORTED | MNT_IGNORE; + mstat->f_flags &= ~(MNT_ROOTFS | MNT_AUTOMOUNTED | MNT_EXPORTED); + sbp->f_flags |= mstat->f_flags; sbp->f_bsize = mstat->f_bsize; sbp->f_iosize = mstat->f_iosize; sbp->f_blocks = mstat->f_blocks;