Cleanups for 4.4BSD-Lite

[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 5330a8a..d9c429c 100644 (file)
--- a/usr/src/sys/kern/vfs_lookup.c
+++ b/usr/src/sys/kern/vfs_lookup.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vfs_lookup.c        8.1 (Berkeley) %G%
+ *     @(#)vfs_lookup.c        8.2 (Berkeley) %G%

  */
 
 #include <sys/param.h>
  */
 
 #include <sys/param.h>


@@ -92,7 +92,7 @@ namei(ndp)
         * Get starting point for the translation.
         */
        if ((ndp->ni_rootdir = fdp->fd_rdir) == NULL)
         * Get starting point for the translation.
         */
        if ((ndp->ni_rootdir = fdp->fd_rdir) == NULL)

-               ndp->ni_rootdir = rootdir;
+               ndp->ni_rootdir = rootvnode;

        dp = fdp->fd_cdir;
        VREF(dp);
        for (;;) {
        dp = fdp->fd_cdir;
        VREF(dp);
        for (;;) {


@@ -319,7 +319,7 @@ dirloop:
         */
        if (cnp->cn_flags & ISDOTDOT) {
                for (;;) {
         */
        if (cnp->cn_flags & ISDOTDOT) {
                for (;;) {

-                       if (dp == ndp->ni_rootdir || dp == rootdir) {
+                       if (dp == ndp->ni_rootdir || dp == rootvnode) {

                                ndp->ni_dvp = dp;
                                ndp->ni_vp = dp;
                                VREF(dp);
                                ndp->ni_dvp = dp;
                                ndp->ni_vp = dp;
                                VREF(dp);