Module Name: src
Committed By: msaitoh
Date: Sun Nov 9 11:03:41 UTC 2014
Modified Files:
src/lib/libperfuse [netbsd-6]: ops.c
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.50.2.17 -r1.50.2.18 src/lib/libperfuse/ops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.50.2.17 src/lib/libperfuse/ops.c:1.50.2.18
--- src/lib/libperfuse/ops.c:1.50.2.17 Sun Nov 9 07:53:39 2014
+++ src/lib/libperfuse/ops.c Sun Nov 9 11:03:41 2014
@@ -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 @@ requeue_request(struct puffs_usermount *
{
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 @@ perfuse_node_inactive(struct puffs_userm
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
