git: 2a2f2f59132a - stable/13 - vfs_domount_update(): postpone setting MNT_UNION until VFS_MOUNT() is done

The branch stable/13 has been updated by kib:

URL: https://cgit.FreeBSD.org/src/commit/?id=2a2f2f59132ad365203c5deb8ed16202a78585c1

commit 2a2f2f59132ad365203c5deb8ed16202a78585c1
Author:     Konstantin Belousov <kib@FreeBSD.org>
AuthorDate: 2024-05-15 09:54:49 +0000
Commit:     Konstantin Belousov <kib@FreeBSD.org>
CommitDate: 2024-05-22 23:47:23 +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 68b22d1a77a8..8cee38c7ec2e 100644
--- a/sys/kern/vfs_mount.c
+++ b/sys/kern/vfs_mount.c
@@ -1155,7 +1155,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;
@@ -1237,6 +1237,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);
@@ -1258,6 +1259,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)
@@ -1361,6 +1367,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,