[src/netbsd-6]: src/sys/nfs Pull up following revision(s) (requested by chs i...

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

details:   https://anonhg.NetBSD.org/src/rev/fbd7344a73a0
branches:  netbsd-6
changeset: 774574:fbd7344a73a0
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Sep 03 18:57:11 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #530):
        sys/nfs/nfs_serv.c: revision 1.164
fix error handling in nfsrv_rename(): when the first nfs_namei() fails,
don't try to free the resources allocated by a successful lookup.

diffstat:

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

diffs (26 lines):

diff -r 7d46ac2e3e9d -r fbd7344a73a0 sys/nfs/nfs_serv.c
--- a/sys/nfs/nfs_serv.c        Mon Sep 03 18:55:11 2012 +0000
+++ b/sys/nfs/nfs_serv.c        Mon Sep 03 18:57:11 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_serv.c,v 1.163 2012/02/01 02:27:24 matt Exp $      */
+/*     $NetBSD: nfs_serv.c,v 1.163.2.1 2012/09/03 18:57:11 riz Exp $   */
 
 /*
  * Copyright (c) 1989, 1993
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.163 2012/02/01 02:27:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_serv.c,v 1.163.2.1 2012/09/03 18:57:11 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1931,6 +1931,7 @@
                        VOP_UNLOCK(fdirp);
        }
        if (error) {
+               fromnd.ni_cnd.cn_nameiop = 0;
                nfsm_reply(2 * NFSX_WCCDATA(v3));
                nfsm_srvwcc_data(fdirfor_ret, &fdirfor, fdiraft_ret, &fdiraft);
                nfsm_srvwcc_data(tdirfor_ret, &tdirfor, tdiraft_ret, &tdiraft);