From nobody Mon Apr 22 13:48:40 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 4VNRRX3HkNz5H89b; Mon, 22 Apr 2024 13:48:40 +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 4VNRRX1Drgz4fxM; Mon, 22 Apr 2024 13:48:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713793720; 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=vCqvuWLFW1wYCC4mj+NvaWg9ljN3ElyhALZU+i/zOT4=; b=nqQeZUWnoiqWz24mVtUiyk5ZyULNSMVoTFyHLBt2Sa3Pn4XP5AbCpt5HLds1QkWW0vf6JZ s9Phceohe1VmK42lEUR8eSpfwTG48kqEkmwv/ImbHHk8KtYPJ1Bc3K9yP/ie+C3HOY2fB8 gzjmGNf4HZ0tRS97pFksYU61/G1b02lZsx9d3eAOdqqsFXubjAeFkutktlhYBHBNgDCAwk fvPCDAj12AjSV48RoS4cXs95uA2euFJo+Pv12bzSgyYnUcs0j1Avol4vv9oUwk3CLGG6pS bkKzi1q9VEBCBF2V9Xc6JX5ML2LjJaKv3rFxLQyfO8j5QeV/4u+2i0a/b78xtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713793720; a=rsa-sha256; cv=none; b=ThIhSFEgGOUpzZetnHokogibo3auKz4XuVP8zA4KhwpqQ5NClSoLX8F8xJGWY9SlZAwjgb XtjBQ5SsteJdsyYe1JnbkQnynzNWFbXonYwBaebQYN2oQWYiW0i7PRysmxS40fBrwVRi7t M9GKBelpEHHQGHMF97y+V9PLGGrjqqbg0ahxXQkIetwRZ7VyrpEUAMNe1VYQFwIhXrB0zy 83pERvReG3CJ+43iFVZBlvqeFnqj4XUtTohOaBzg/Ygfqstqz8pbi5TvJHLCBp204HLZ51 VPlouo5DAWCqP0g7jyAqMU+JttoDIVNdAFuhqEVvjld+KACtOZWm2tZ/7tO7RA== 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=1713793720; 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=vCqvuWLFW1wYCC4mj+NvaWg9ljN3ElyhALZU+i/zOT4=; b=M5lODXOnS2zQTtaHLcG5k0vUDSCYU6One5TiFdrF6AtnC9rgpMkTLX9sTKkxAfxkIqZQ+N x9xDko1l5vl9yDK+JqCjUIfcK3STUEcb5SwI1BXAhFfQ2icrSdkuaL5mEQuxa5LYf5zJEG EU0eUoITE3y4hhm1Bq+fq1+XwSA4PAJptFzibdlWV+3BuCisk1TaSE1xUdFylFznwssatM 4MySpLzy+FNlowqQ0OKuKv82KqWJn6tOy3QGvqu9ogvYlh7EbVl01K/uQc3byYb/ljYWnG kHcA07ikL+iC1q1eEXIlgw8Ju8XJ6+99yR3dh1JeLSGFibmpn6q9L4WjhCK02w== 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 4VNRRX0r9BzqZb; Mon, 22 Apr 2024 13:48:40 +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 43MDmeoK021997; Mon, 22 Apr 2024 13:48:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43MDmefA021994; Mon, 22 Apr 2024 13:48:40 GMT (envelope-from git) Date: Mon, 22 Apr 2024 13:48:40 GMT Message-Id: <202404221348.43MDmefA021994@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: 0ee0770fafc3 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 commit 0ee0770fafc3d3b240c699439f4a9fd7eeb8d481 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-22 13:48:15 +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 5114fa0b50ae..35d0f46d0ef7 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -371,9 +371,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;