[src/netbsd-1-4]: src/sys/nfs pull up rev 1.30 from trunk (requested by somme...

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

details:   https://anonhg.NetBSD.org/src/rev/09a091fa4d8f
branches:  netbsd-1-4
changeset: 469551:09a091fa4d8f
user:      cgd <cgd%NetBSD.org@localhost>
date:      Sun Oct 10 20:13:54 1999 +0000

description:
pull up rev 1.30 from trunk (requested by sommerfeld):
  Fix an odd corner case if you use nfsv3 and nqnfs at the same time:
  v3 changes the error-case behavior of the nfsm_reply macro, but the
  caller keeps going and in this case you end up calling vput(NULL).

diffstat:

 sys/nfs/nfs_nqlease.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r a7a1fb377eee -r 09a091fa4d8f sys/nfs/nfs_nqlease.c
--- a/sys/nfs/nfs_nqlease.c     Sun Oct 10 20:10:22 1999 +0000
+++ b/sys/nfs/nfs_nqlease.c     Sun Oct 10 20:13:54 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_nqlease.c,v 1.29 1999/03/25 04:07:33 sommerfe Exp $        */
+/*     $NetBSD: nfs_nqlease.c,v 1.29.2.1 1999/10/10 20:13:54 cgd Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -698,12 +698,15 @@
        nfsd->nd_duration = fxdr_unsigned(int, *tl);
        error = nfsrv_fhtovp(fhp, 1, &vp, cred, slp, nam, &rdonly,
                (nfsd->nd_flag & ND_KERBAUTH), FALSE);
-       if (error)
+       if (error) {
                nfsm_reply(0);
+               return 0;
+       }
        if (rdonly && flags == ND_WRITE) {
                vput(vp);
                error = EROFS;
                nfsm_reply(0);
+               return 0;
        }
        (void) nqsrv_getlease(vp, &nfsd->nd_duration, flags, slp, procp,
                nam, &cache, &frev, cred);