From nobody Sat Apr 13 15:21:23 2024 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 4VGxwg75Z5z5Hd7W; Sat, 13 Apr 2024 15:21:23 +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 4VGxwg6dVLz4HSJ; Sat, 13 Apr 2024 15:21:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713021683; 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=IwRiTVBNf/K9nkYw1tKgeNhkQJ+3j5LCkltB8EwCwgo=; b=ggxXJrDHewdjEfC5GusAhLVbwLZKR5adRvQ08SgoE3CndvoTqedzz15gF8o6Qun3DlFOjX PQO5InLTtWejYqJByMxgMIE8NxSS0hSxeVVp0h8SJVY9tk19leso35e3tyBUFL+L3v6sKX IvoYQ9kL6Yonlej2LNuRlrM20b1XzYtq4W/2WBTWfHTAzakRz2gBsD91syP06mi6h9tZaj Q1MBjZE8nQU2YbrbPycY77sgPOIPHMaQQ28WX1gKjuxibICJ4EKRJWZ1gDUJaN+uP/W4Ad scHA2oS0JWe9GdIBmbpnVknAuuXnK8liHfDooLvZlCe83MANymdF0NsQU3pCrQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713021683; a=rsa-sha256; cv=none; b=VsjiianrhxlThNXQ8N04G+OpFUp1O6aGmUe2aWysZLVbTBylSJ99xEse3vpVnVRRH8dXJC pPk2SvCBpU7X7/C41HfanV5UUkrim37wfL0Esp3xyCTN8+PEMBtfIvqQc02R/Y4zbtL3MM bgqZFIbrBHq5VUVB/4QScM73FMmhEZIUsTTFFCClL8EpDQW1XBiqDWATJeOckwBzq3udx8 NBcyR1PRxWsM8N3GgrHgAN+uo43Xfyiz3nE3b7fdBK93RkndJEt1Qc0R18hSsQgItwBl0B 26czWeSFqgGChltOB9ig1cKq+0A3PjjTGZgKK9j06HsmbgoiCQAtUVpcL34xBg== 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=1713021683; 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=IwRiTVBNf/K9nkYw1tKgeNhkQJ+3j5LCkltB8EwCwgo=; b=gAutlmclzDSKBIFGhmCgAJ0dBl24d0VYnEg18zp8AYE4TOc9ab5bhnMkWjvYhaG5Dtm0jV EwSunXP4RTvl3fFed0hPFSaY8ukhE0W84j95rNNEGWJ4SbUxW585mCJTeLjqOCHuyi5WuM xkZlg0zsbSaOf1BByHyjcmN/i2YjV8w5biMKncvguDhsbc/BHp24J0wNHsbIDVLzgXTGUl 6yD6z8SR8yjx+uspmeQP+jE5QCfFwCiNHBK3Ws13Ip0i4QJbHSRTVMs4Jz10ETHmaohnN7 pi27Wstwfw0i/Y2VRsc+VVszxveYzdScBy2B0iy25t5CIGDuhZBTYYitTEBJmQ== 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 4VGxwg6F2Pzdtf; Sat, 13 Apr 2024 15:21:23 +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 43DFLNjK031339; Sat, 13 Apr 2024 15:21:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43DFLNbY031336; Sat, 13 Apr 2024 15:21:23 GMT (envelope-from git) Date: Sat, 13 Apr 2024 15:21:23 GMT Message-Id: <202404131521.43DFLNbY031336@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2b258dd17caf - main - nullfs: Show correct exported flag. 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 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/main X-Git-Reftype: branch X-Git-Commit: 2b258dd17caf329bc549f93d9858b74109a479d7 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2b258dd17caf329bc549f93d9858b74109a479d7 commit 2b258dd17caf329bc549f93d9858b74109a479d7 Author: Dag-Erling Smørgrav AuthorDate: 2024-04-13 15:20:49 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-04-13 15:21:01 +0000 nullfs: Show correct exported flag. MFC after: 3 days Reviewed by: allanjude, kib Differential Revision: https://reviews.freebsd.org/D44773 --- 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 a15a5e22673e..7ab1fb6c1a25 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -367,9 +367,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;