[src/netbsd-1-4]: src/sys/nfs pullup 1.50->1.51 (sommerfeld)

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

details:   https://anonhg.NetBSD.org/src/rev/ead1f06970d2
branches:  netbsd-1-4
changeset: 468635:ead1f06970d2
user:      perry <perry%NetBSD.org@localhost>
date:      Tue May 04 17:10:00 1999 +0000

description:
pullup 1.50->1.51 (sommerfeld)

diffstat:

 sys/nfs/nfs_serv.c |  15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r d7e9c10a98d1 -r ead1f06970d2 sys/nfs/nfs_serv.c
--- a/sys/nfs/nfs_serv.c        Tue May 04 17:07:15 1999 +0000
+++ b/sys/nfs/nfs_serv.c        Tue May 04 17:10:00 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_serv.c,v 1.50 1999/03/30 12:01:18 mycroft Exp $    */
+/*     $NetBSD: nfs_serv.c,v 1.50.2.1 1999/05/04 17:10:00 perry Exp $  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -1570,7 +1570,12 @@
                free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
                error = NFSERR_BADTYPE;
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-               vput(nd.ni_dvp);
+               if (nd.ni_dvp == nd.ni_vp)
+                       vrele(nd.ni_dvp);
+               else
+                       vput(nd.ni_dvp);
+               if (nd.ni_vp)
+                       vput(nd.ni_vp);
                goto out;
        }
        VATTR_NULL(&va);
@@ -1590,7 +1595,11 @@
                free((caddr_t)nd.ni_cnd.cn_pnbuf, M_NAMEI);
                error = EEXIST;
                VOP_ABORTOP(nd.ni_dvp, &nd.ni_cnd);
-               vput(nd.ni_dvp);
+               if (nd.ni_dvp == nd.ni_vp)
+                       vrele(nd.ni_dvp);
+               else
+                       vput(nd.ni_dvp);
+               vput(nd.ni_vp);
                goto out;
        }
        va.va_type = vtyp;