[src/trunk]: src/sys/kern Move assignment of search directory from ni_dvp out...

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

details:   https://anonhg.NetBSD.org/src/rev/c974753922c0
branches:  trunk
changeset: 764055:c974753922c0
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Apr 11 01:38:47 2011 +0000

description:
Move assignment of search directory from ni_dvp outside namei_follow.

diffstat:

 sys/kern/vfs_lookup.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (34 lines):

diff -r 41c7c0b6b884 -r c974753922c0 sys/kern/vfs_lookup.c
--- a/sys/kern/vfs_lookup.c     Mon Apr 11 01:38:24 2011 +0000
+++ b/sys/kern/vfs_lookup.c     Mon Apr 11 01:38:47 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vfs_lookup.c,v 1.141 2011/04/11 01:38:24 dholland Exp $        */
+/*     $NetBSD: vfs_lookup.c,v 1.142 2011/04/11 01:38:47 dholland Exp $        */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.141 2011/04/11 01:38:24 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_lookup.c,v 1.142 2011/04/11 01:38:47 dholland Exp $");
 
 #include "opt_magiclinks.h"
 
@@ -717,7 +717,6 @@
        memcpy(ndp->ni_pnbuf, cp, ndp->ni_pathlen);
        PNBUF_PUT(cp);
        vput(ndp->ni_vp);
-       searchdir = ndp->ni_dvp;
 
        /*
         * Check if root directory should replace current directory.
@@ -1176,6 +1175,7 @@
                        if (neverfollow) {
                                error = EINVAL;
                        } else {
+                               state->namei_startdir = ndp->ni_dvp;
                                error = namei_follow(state, inhibitmagic,
                                                     state->namei_startdir,
                                                     &state->namei_startdir);