[src/netbsd-9]: src/sys Pull up following revision(s) (requested by hannken i...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6c18c2506d3d
branches:  netbsd-9
changeset: 373389:6c18c2506d3d
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Feb 06 17:04:48 2023 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #1587):

        sys/fs/union/union_vfsops.c: revision 1.86
        sys/miscfs/nullfs/null_vfsops.c: revision 1.101 (via patch)

Set IMNT_MPSAFE only if all lower layers have it set.

diffstat:

 sys/fs/union/union_vfsops.c     |  13 ++++++++++---
 sys/miscfs/nullfs/null_vfsops.c |   6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 13e1e596fdf7 -r 6c18c2506d3d sys/fs/union/union_vfsops.c
--- a/sys/fs/union/union_vfsops.c       Mon Feb 06 16:54:53 2023 +0000
+++ b/sys/fs/union/union_vfsops.c       Mon Feb 06 17:04:48 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: union_vfsops.c,v 1.79 2019/02/20 10:05:59 hannken Exp $        */
+/*     $NetBSD: union_vfsops.c,v 1.79.4.1 2023/02/06 17:04:48 martin Exp $     */
 
 /*
  * Copyright (c) 1994 The Regents of the University of California.
@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.79 2019/02/20 10:05:59 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: union_vfsops.c,v 1.79.4.1 2023/02/06 17:04:48 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -200,7 +200,14 @@
                goto bad;
        }
 
-       mp->mnt_iflag |= IMNT_MPSAFE;
+       /*
+        * This mount is mp-safe if both lower mounts are mp-safe.
+        */
+
+       if (((um->um_lowervp == NULLVP) ||
+           (um->um_lowervp->v_mount->mnt_iflag & IMNT_MPSAFE)) &&
+           (um->um_uppervp->v_mount->mnt_iflag & IMNT_MPSAFE))
+               mp->mnt_iflag |= IMNT_MPSAFE;
 
        /*
         * Unless the mount is readonly, ensure that the top layer
diff -r 13e1e596fdf7 -r 6c18c2506d3d sys/miscfs/nullfs/null_vfsops.c
--- a/sys/miscfs/nullfs/null_vfsops.c   Mon Feb 06 16:54:53 2023 +0000
+++ b/sys/miscfs/nullfs/null_vfsops.c   Mon Feb 06 17:04:48 2023 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: null_vfsops.c,v 1.95.4.1 2019/12/24 17:45:53 martin Exp $      */
+/*     $NetBSD: null_vfsops.c,v 1.95.4.2 2023/02/06 17:04:48 martin Exp $      */
 
 /*
  * Copyright (c) 1999 National Aeronautics & Space Administration
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.95.4.1 2019/12/24 17:45:53 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: null_vfsops.c,v 1.95.4.2 2023/02/06 17:04:48 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -140,7 +140,7 @@
        /* Create the mount point. */
        nmp = kmem_zalloc(sizeof(struct null_mount), KM_SLEEP);
        mp->mnt_data = nmp;
-       mp->mnt_iflag |= IMNT_MPSAFE;
+       mp->mnt_iflag |= lowerrootvp->v_mount->mnt_iflag & IMNT_MPSAFE;
 
        /*
         * Make sure that the mount point is sufficiently initialized