merge in vnode changes

[unix-history] / usr / src / sys / kern / vfs_lookup.c

diff --git a/usr/src/sys/kern/vfs_lookup.c b/usr/src/sys/kern/vfs_lookup.c
index a6338e4..c447c9b 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -3,7 +3,7 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)vfs_lookup.c        7.4 (Berkeley) %G%
+ *     @(#)vfs_lookup.c        7.5 (Berkeley) %G%

  */
 
 #include "param.h"
  */
 
 #include "param.h"


@@ -240,6 +240,35 @@ dirloop2:
                return (dp);
        }
 
                return (dp);
        }
 

+       /*
+        * Special handling for ".." allowing chdir out of mounted
+        * file system: indirect .. in root inode to reevaluate
+        * in directory file system was mounted on.
+        */
+       if (isdotdot) {
+               for (;;) {
+                       if (dp == u.u_rdir || dp == rootdir) {
+                               ndp->ni_dent.d_ino = dp->i_number;
+                               pdp = dp;
+                               dp->i_count++;
+                               goto haveino;
+                       }
+                       if (dp->i_number != ROOTINO)
+                               break;
+                       for (i = 1; i < NMOUNT; i++) {
+                               if (mount[i].m_fs != NULL &&
+                                   mount[i].m_dev == dp->i_dev) {
+                                       iput(dp);
+                                       dp = mount[i].m_inodp;
+                                       ILOCK(dp);
+                                       dp->i_count++;
+                                       fs = dp->i_fs;
+                                       break;
+                               }
+                       }
+               }
+       }
+

        /*
         * We now have a segment name to search for, and a directory to search.
         *
        /*
         * We now have a segment name to search for, and a directory to search.
         *


@@ -622,31 +651,6 @@ found:
                return (dp);
        }
 
                return (dp);
        }
 

-       /*
-        * Special handling for ".." allowing chdir out of mounted
-        * file system: indirect .. in root inode to reevaluate
-        * in directory file system was mounted on.
-        */
-       if (isdotdot) {
-               if (dp == u.u_rdir) {
-                       ndp->ni_dent.d_ino = dp->i_number;
-                       makeentry = 0;
-               } else if (ndp->ni_dent.d_ino == ROOTINO &&
-                  dp->i_number == ROOTINO) {
-                       for (i = 1; i < NMOUNT; i++)
-                       if (mount[i].m_fs != NULL &&
-                          mount[i].m_dev == dp->i_dev) {
-                               iput(dp);
-                               dp = mount[i].m_inodp;
-                               ILOCK(dp);
-                               dp->i_count++;
-                               fs = dp->i_fs;
-                               cp -= 2;     /* back over .. */
-                               goto dirloop2;
-                       }
-               }
-       }
-

        /*
         * If rewriting (rename), return the inode and the
         * information required to rewrite the present directory
        /*
         * If rewriting (rename), return the inode and the
         * information required to rewrite the present directory