summaryrefslogtreecommitdiff
path: root/lib/libperfuse
diff options
context:
space:
mode:
authormanu <manu@NetBSD.org>2014-11-04 09:17:31 +0000
committermanu <manu@NetBSD.org>2014-11-04 09:17:31 +0000
commit76d1ca061f7f21dcdd08e7e99ad524bf8a0e5f9c (patch)
treef41d8891e3db872468ef6bf3b650c4b205831e91 /lib/libperfuse
parentd45cf633561ed43d961044aff422c1ac4001f11f (diff)
Restore build with -DDEBUG, and avoid a spurious diagnostic error with -DDEBUG
Diffstat (limited to 'lib/libperfuse')
-rw-r--r--lib/libperfuse/ops.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/lib/libperfuse/ops.c b/lib/libperfuse/ops.c
index feb0da68e67..113770d8760 100644
--- a/lib/libperfuse/ops.c
+++ b/lib/libperfuse/ops.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.79 2014/10/31 15:20:08 manu Exp $ */
+/* $NetBSD: ops.c,v 1.80 2014/11/04 09:17:31 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -813,11 +813,6 @@ requeue_request(struct puffs_usermount *pu, puffs_cookie_t opc,
{
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 @@ perfuse_node_inactive(struct puffs_usermount *pu, puffs_cookie_t opc)
if (opc == 0)
return 0;
- node_ref(opc);
pnd = PERFUSE_NODE_DATA(opc);
-
if (!(pnd->pnd_flags & (PND_OPEN|PND_REMOVED)))
- goto out;
+ return 0;
+
+ node_ref(opc);
/*
* Make sure all operation are finished