Author: avg
Date: Wed Jul 13 09:02:14 2016
New Revision: 302715
URL: https://svnweb.freebsd.org/changeset/base/302715

Log:
  MFC r299913: dounmount: do not call mountcheckdirs() for mounts with 
MNT_IGNORE

Modified:
  stable/9/sys/kern/vfs_mount.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/vfs_mount.c
==============================================================================
--- stable/9/sys/kern/vfs_mount.c       Wed Jul 13 08:33:57 2016        
(r302714)
+++ stable/9/sys/kern/vfs_mount.c       Wed Jul 13 09:02:14 2016        
(r302715)
@@ -1306,7 +1306,8 @@ dounmount(mp, flags, td)
         */
        if ((flags & MNT_FORCE) &&
            VFS_ROOT(mp, LK_EXCLUSIVE, &fsrootvp) == 0) {
-               if (mp->mnt_vnodecovered != NULL)
+               if (mp->mnt_vnodecovered != NULL &&
+                   (mp->mnt_flag & MNT_IGNORE) == 0)
                        mountcheckdirs(fsrootvp, mp->mnt_vnodecovered);
                if (fsrootvp == rootvnode) {
                        vrele(rootvnode);
@@ -1327,7 +1328,8 @@ dounmount(mp, flags, td)
        if (error && error != ENXIO) {
                if ((flags & MNT_FORCE) &&
                    VFS_ROOT(mp, LK_EXCLUSIVE, &fsrootvp) == 0) {
-                       if (mp->mnt_vnodecovered != NULL)
+                       if (mp->mnt_vnodecovered != NULL &&
+                           (mp->mnt_flag & MNT_IGNORE) == 0)
                                mountcheckdirs(mp->mnt_vnodecovered, fsrootvp);
                        if (rootvnode == NULL) {
                                rootvnode = fsrootvp;
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"

Reply via email to