[src/netbsd-1-6]: src/sys/kern Pullup rev 1.22 (requested by enami in ticket ...

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

details:   https://anonhg.NetBSD.org/src/rev/87986a1470c4
branches:  netbsd-1-6
changeset: 531146:87986a1470c4
user:      jmc <jmc%NetBSD.org@localhost>
date:      Mon Mar 15 05:22:25 2004 +0000

description:
Pullup rev 1.22 (requested by enami in ticket #1616)

Rewind the 'bp' advanced backward by cache_revlookup() if getcwd_getcache()
finally returns cache miss.

diffstat:

 sys/kern/vfs_getcwd.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r de4779b499bd -r 87986a1470c4 sys/kern/vfs_getcwd.c
--- a/sys/kern/vfs_getcwd.c     Mon Mar 15 05:16:03 2004 +0000
+++ b/sys/kern/vfs_getcwd.c     Mon Mar 15 05:22:25 2004 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_getcwd.c,v 1.15 2001/11/12 15:25:37 lukem Exp $ */
+/* $NetBSD: vfs_getcwd.c,v 1.15.10.1 2004/03/15 05:22:25 jmc Exp $ */
 
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.15 2001/11/12 15:25:37 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_getcwd.c,v 1.15.10.1 2004/03/15 05:22:25 jmc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -310,6 +310,7 @@
        char *bufp;
 {
        struct vnode *lvp, *uvp = NULL;
+       char *obp = *bpp;
        int error;
        int vpid;
        
@@ -354,6 +355,7 @@
                 */
                if (!error) vput(uvp);
                *uvpp = NULL;
+               *bpp = obp;
                
                error = vn_lock(lvp, LK_EXCLUSIVE | LK_RETRY);