From nobody Thu May 23 00:27:09 2024 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 4Vl8BP5xD5z5LLL5; Thu, 23 May 2024 00:27:09 +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 4Vl8BP5Nflz4gCq; Thu, 23 May 2024 00:27:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716424029; 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=F7hzKJtyyaZp1+/ksN+a2TwrVnid7KEHWmGrb9sETs8=; b=ZpGF/W7hhcryoNyi21cG2glfja7w+ePaiaSoDaV8x/CSqbqt3wJRs4iA0RKnYHMIKas56z 74YuumAZeNX9mYuQENo0EDddDY9p697pciJH3B8RIgU3HZpVfMi1I40RjVHcbXVPDT8a5r JVuuT2awvH6JP3ZArdI9tytZINFcMsCC7RGAwGv3uwK442SlknbVSxucZADqmpbAJN7pFG ZXQDP4IuTrsYY6oibYCoGp/4BGIKURiyfmkfp6oG6zs9J3ZtgR1jQ95kpfPkcuPgP9nSsy vI9V1HyBrWgtd0CPclRuNfY3r12uC7cBgzXCQ2teIaScRt2X9+eaOKLv61fYOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716424029; a=rsa-sha256; cv=none; b=A3da8UaluXJSaGYlZ46HEZeb/1tPJ6pXtKmdrqUnWrWsescWJVGbcSeYhjavIKxMg6CN9Z PpfPY0Eq5FPmssduf77F+giOYKoWX5vNF7TrudVk0EImFNtLUDWILWWI0CLuA7Gp5rksbe yXD8uK4eiLnJCMBSAZJmTmuSSSpCjFgJuD2+ErORllKGpvbXdnSZZocrDqknFFeYtbTGgl cgYbyqJPbI8qi1BELFfe0IQOiLpOgFQxijN8y9whEXxPbJE09UiVKHi9JE54Lh8CN3CplF bga5U0516iZH10/PwtHZ2uC0z+JL0LLVOrIT8tz65zb6CXp2Un+43GKV4WgKrg== 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=1716424029; 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=F7hzKJtyyaZp1+/ksN+a2TwrVnid7KEHWmGrb9sETs8=; b=eI9s1/Ueh3IEvBOgOoA2eFP/zM+M0HiipGsYd70q22uB2hfl1wnf05LjRsZYB/fJrdEnSp l6jLR6ubu2daQFsHyGXhG6GlTlOxG95ajRLNR6HmUuvTAkqm74fh8//Z5j5xi1WvyyqAoh rjIyGesB4bmX0UJgX97X9sGCF/KfeW3ybZFDKvx1G0l/Fl6bAPaCbTP25yZWbhhMzzJzuH WjOn1NOJqIYAIVkQ2uZgdrx3uvq1wWS7xSkGScri1XOynOnbv1z9/X6A0aDGzdPacKz1BJ C5et0krihvqGRyb7d7fuKbtCHsDz6BcN9pUpdowW1WopTelEVN7F40sLLviFDQ== 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 4Vl8BP4zSmzQxX; Thu, 23 May 2024 00:27:09 +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 44N0R96S020599; Thu, 23 May 2024 00:27:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N0R9Ib020596; Thu, 23 May 2024 00:27:09 GMT (envelope-from git) Date: Thu, 23 May 2024 00:27:09 GMT Message-Id: <202405230027.44N0R9Ib020596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 625a622cc651 - stable/14 - vfs_domount_update(): postpone setting MNT_UNION until VFS_MOUNT() is done 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 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/14 X-Git-Reftype: branch X-Git-Commit: 625a622cc6511e250470ee3f84a8553c7c734de6 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=625a622cc6511e250470ee3f84a8553c7c734de6 commit 625a622cc6511e250470ee3f84a8553c7c734de6 Author: Konstantin Belousov AuthorDate: 2024-05-15 09:54:49 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-23 00:26:43 +0000 vfs_domount_update(): postpone setting MNT_UNION until VFS_MOUNT() is done PR: 265311 (cherry picked from commit 21ccdb4119afdfdfeaa80e9c8514171c65b35862) --- sys/kern/vfs_mount.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_mount.c b/sys/kern/vfs_mount.c index 9289c35e4f86..206618b4ac6b 100644 --- a/sys/kern/vfs_mount.c +++ b/sys/kern/vfs_mount.c @@ -1314,7 +1314,7 @@ vfs_domount_update( void *bufp; struct mount *mp; int error, export_error, i, len, fsid_up_len; - uint64_t flag; + uint64_t flag, mnt_union; gid_t *grps; fsid_t *fsid_up; bool vfs_suser_failed; @@ -1396,6 +1396,7 @@ vfs_domount_update( vfs_deleteopt(*optlist, "fsid"); } + mnt_union = 0; MNT_ILOCK(mp); if ((mp->mnt_kern_flag & MNTK_UNMOUNT) != 0) { MNT_IUNLOCK(mp); @@ -1417,6 +1418,11 @@ vfs_domount_update( mp->mnt_flag |= MNT_UPDATE; } else { mp->mnt_flag &= ~MNT_UPDATEMASK; + if ((mp->mnt_flag & MNT_UNION) == 0 && + (fsflags & MNT_UNION) != 0) { + fsflags &= ~MNT_UNION; + mnt_union = MNT_UNION; + } mp->mnt_flag |= fsflags & (MNT_RELOAD | MNT_FORCE | MNT_UPDATE | MNT_SNAPSHOT | MNT_ROOTFS | MNT_UPDATEMASK | MNT_RDONLY); if ((mp->mnt_flag & MNT_ASYNC) == 0) @@ -1520,6 +1526,7 @@ vfs_domount_update( if (error == 0) { mp->mnt_flag &= ~(MNT_UPDATE | MNT_RELOAD | MNT_FORCE | MNT_SNAPSHOT); + mp->mnt_flag |= mnt_union; } else { /* * If we fail, restore old mount flags. MNT_QUOTA is special,