[src/netbsd-6]: src/lib/libperfuse Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/e6d01eb3648b
branches:  netbsd-6
changeset: 776784:e6d01eb3648b
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Nov 09 11:03:41 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #1186):
        lib/libperfuse/ops.c: revision 1.80
Restore build with -DDEBUG, and avoid a spurious diagnostic error with
-DDEBUG

diffstat:

 lib/libperfuse/ops.c |  15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diffs (37 lines):

diff -r 583415223ca9 -r e6d01eb3648b lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Sun Nov 09 08:00:41 2014 +0000
+++ b/lib/libperfuse/ops.c      Sun Nov 09 11:03:41 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.50.2.17 2014/11/09 07:53:39 msaitoh Exp $ */
+/*  $NetBSD: ops.c,v 1.50.2.18 2014/11/09 11:03:41 msaitoh Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -803,11 +803,6 @@
 {
        struct perfuse_cc_queue pcq;
        struct perfuse_node_data *pnd;
-#ifdef PERFUSE_DEBUG
-       struct perfuse_state *ps;
-
-       ps = perfuse_getspecific(pu);
-#endif
 
        pnd = PERFUSE_NODE_DATA(opc);
        pcq.pcq_type = type;
@@ -2811,11 +2806,11 @@
        if (opc == 0)
                return 0;
 
+       pnd = PERFUSE_NODE_DATA(opc);
+       if (!(pnd->pnd_flags & (PND_OPEN|PND_REMOVED)))
+               return 0;
+
        node_ref(opc);
-       pnd = PERFUSE_NODE_DATA(opc);
-
-       if (!(pnd->pnd_flags & (PND_OPEN|PND_REMOVED)))
-               goto out;
 
        /*
         * Make sure all operation are finished