check for symbolic links after mount points to keep AMD hard mounts happy

SCCS-vsn: sys/kern/vfs_lookup.c 8.6

diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c
index e9392de..6700569 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -403,15 +403,6 @@ unionlookup:
        }
 
        dp = ndp->ni_vp;
        }
 
        dp = ndp->ni_vp;

-       /*
-        * Check for symbolic link
-        */
-       if ((dp->v_type == VLNK) &&
-           ((cnp->cn_flags & FOLLOW) || *ndp->ni_next == '/')) {
-               cnp->cn_flags |= ISSYMLINK;
-               return (0);
-       }
-

        /*
         * Check to see if the vnode has been mounted on;
         * if so find the root of the mounted file system.
        /*
         * Check to see if the vnode has been mounted on;
         * if so find the root of the mounted file system.


@@ -429,6 +420,15 @@ unionlookup:
                ndp->ni_vp = dp = tdp;
        }
 
                ndp->ni_vp = dp = tdp;
        }
 

+       /*
+        * Check for symbolic link
+        */
+       if ((dp->v_type == VLNK) &&
+           ((cnp->cn_flags & FOLLOW) || *ndp->ni_next == '/')) {
+               cnp->cn_flags |= ISSYMLINK;
+               return (0);
+       }
+

 nextname:
        /*
         * Not a symbolic link.  If more pathname,
 nextname:
        /*
         * Not a symbolic link.  If more pathname,