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

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

details:   https://anonhg.NetBSD.org/src/rev/b48d714f4227
branches:  netbsd-7
changeset: 798509:b48d714f4227
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Sun Nov 09 10:06:34 2014 +0000

description:
Pull up following revision(s) (requested by manu in ticket #192):
        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 49f19abcca5f -r b48d714f4227 lib/libperfuse/ops.c
--- a/lib/libperfuse/ops.c      Fri Nov 07 21:39:06 2014 +0000
+++ b/lib/libperfuse/ops.c      Sun Nov 09 10:06:34 2014 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: ops.c,v 1.66.2.11 2014/11/05 18:18:27 snj Exp $ */
+/*  $NetBSD: ops.c,v 1.66.2.12 2014/11/09 10:06:34 msaitoh Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -813,11 +813,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;
@@ -2821,11 +2816,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