[src/netbsd-1-6]: src/sys/nfs Pullup revision 1.152. Original log message:

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

details:   https://anonhg.NetBSD.org/src/rev/c7e367ddeed6
branches:  netbsd-1-6
changeset: 529170:c7e367ddeed6
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Oct 18 19:55:35 2002 +0000

description:
Pullup revision 1.152.  Original log message:

nfs_remove(): Don't vput() the vnode twice if vp == dvp, vrele() and
vput() instead.

diffstat:

 sys/nfs/nfs_vnops.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (31 lines):

diff -r d28a89f2e4ee -r c7e367ddeed6 sys/nfs/nfs_vnops.c
--- a/sys/nfs/nfs_vnops.c       Tue Oct 15 23:02:51 2002 +0000
+++ b/sys/nfs/nfs_vnops.c       Fri Oct 18 19:55:35 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_vnops.c,v 1.151 2002/05/19 20:51:04 tls Exp $      */
+/*     $NetBSD: nfs_vnops.c,v 1.151.2.1 2002/10/18 19:55:35 thorpej Exp $      */
 
 /*
  * Copyright (c) 1989, 1993
@@ -43,7 +43,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.151 2002/05/19 20:51:04 tls Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_vnops.c,v 1.151.2.1 2002/10/18 19:55:35 thorpej Exp $");
 
 #include "opt_nfs.h"
 #include "opt_uvmhist.h"
@@ -1593,8 +1593,11 @@
                error = nfs_sillyrename(dvp, vp, cnp);
        PNBUF_PUT(cnp->cn_pnbuf);
        np->n_attrstamp = 0;
+       if (dvp == vp)
+               vrele(vp);
+       else
+               vput(vp);
        vput(dvp);
-       vput(vp);
        return (error);
 }