 @@ -1,14 +1,14 @@
-/*  $NetBSD: ops.c,v 1.50 2012/01/29 06:22:02 manu Exp $ */
+/*  $NetBSD: ops.c,v 1.51 2012/03/08 14:58:57 manu Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
+ *
 @@ -504,26 +504,27 @@ node_lookup_common(pu, opc, path, pcr, p
 				"cookie = %p, nodeid = 0x%"PRIx64" "
 				"for \"%s\"\n", __func__,
 				(void *)opc, perfuse_node_path(opc),
 				(void *)oldpnd->pnd_pn, oldpnd->pnd_nodeid,
 				path);
 #endif
 		break;
+	}
 	/*
 	 * Check for cached name
 	 */
 	if ((oldpnd != NULL) && !entry_expired(oldpnd->pnd_pn)) {
 		oldpnd->pnd_puffs_nlookup++;
 		*pnp = oldpnd->pnd_pn;
 		return 0;
+	}
 	len = strlen(path) + 1;
 	pm = ps->ps_new_msg(pu, opc, FUSE_LOOKUP, len, pcr);
 	(void)strlcpy(_GET_INPAYLOAD(ps, pm, char *), path, len);
 	error = xchg_msg(pu, opc, pm, sizeof(*feo), wait_reply);
 	switch (error) {
 	case 0:
 @@ -540,27 +541,28 @@ node_lookup_common(pu, opc, path, pcr, p
 #endif
+		}
 		/* FALLTHROUGH */
 	default:
 		return error;
 		/* NOTREACHED */
 		break;
+	}
 	feo = GET_OUTPAYLOAD(ps, pm, fuse_entry_out);
 	if (oldpnd != NULL) {
 		if (oldpnd->pnd_nodeid == feo->nodeid) {
-			oldpnd->pnd_nlookup++;
+			oldpnd->pnd_fuse_nlookup++;
 			oldpnd->pnd_puffs_nlookup++;
 			*pnp = oldpnd->pnd_pn;
 			ps->ps_destroy_msg(pm);
 			return 0;
 		} else {
 			oldpnd->pnd_flags |= PND_REMOVED;
 #ifdef PERFUSE_DEBUG
 			if (perfuse_diagflags & PDF_FILENAME)
 				DPRINTF("%s: opc = %p nodeid = 0x%"PRIx64" "
 					"file = \"%s\" replaced\n", __func__,
 					oldpnd->pnd_pn, oldpnd->pnd_nodeid,
 					oldpnd->pnd_name);
 #endif
 @@ -2692,83 +2694,84 @@ perfuse_node_reclaim(pu, opc)
 	struct puffs_node *pn;
 	struct puffs_node *pn_root;
 	ps = puffs_getspecific(pu);
 	pnd = PERFUSE_NODE_DATA(opc);
 	/*
 	 * Never forget the root.
 	 */
 	if (pnd->pnd_nodeid == FUSE_ROOT_ID)
 		return 0;
 	pnd->pnd_flags |= PND_RECLAIMED;
 	pnd->pnd_puffs_nlookup--;
 #ifdef PERFUSE_DEBUG
 	if (perfuse_diagflags & PDF_RECLAIM)
 		DPRINTF("%s (nodeid %"PRId64") reclaimed\n",
 			perfuse_node_path(opc), pnd->pnd_nodeid);
 #endif
 	pn_root = puffs_getroot(pu);
 	pn = (struct puffs_node *)opc;
 	while (pn != pn_root) {
 		struct puffs_node *parent_pn;
 		pnd = PERFUSE_NODE_DATA(pn);
 #ifdef PERFUSE_DEBUG
 	if (perfuse_diagflags & PDF_RECLAIM)
-		DPRINTF("%s (nodeid %"PRId64") is %sreclaimed, "
+		DPRINTF("%s (nodeid %"PRId64") is %sreclaimed, nlookup = %d "
 			"has childcount %d %s%s%s%s, pending ops:%s%s%s\n",
 		        perfuse_node_path((puffs_cookie_t)pn), pnd->pnd_nodeid,
 		        pnd->pnd_flags & PND_RECLAIMED ? "" : "not ",
-		        pnd->pnd_childcount,
+			pnd->pnd_puffs_nlookup, pnd->pnd_childcount,
 			pnd->pnd_flags & PND_OPEN ? "open " : "not open",
 			pnd->pnd_flags & PND_RFH ? "r" : "",
 			pnd->pnd_flags & PND_WFH ? "w" : "",
 			pnd->pnd_flags & PND_BUSY ? "" : " none",
 			pnd->pnd_flags & PND_INREADDIR ? " readdir" : "",
 			pnd->pnd_flags & PND_INWRITE ? " write" : "",
 			pnd->pnd_flags & PND_INOPEN ? " open" : "");
 #endif
 		if (!(pnd->pnd_flags & PND_RECLAIMED) ||
 		    (pnd->pnd_puffs_nlookup != 0) ||
 		    (pnd->pnd_childcount != 0))
 			return 0;
 #ifdef PERFUSE_DEBUG
 		if ((pnd->pnd_flags & PND_OPEN) ||
 		       !TAILQ_EMPTY(&pnd->pnd_pcq))
 			DERRX(EX_SOFTWARE, "%s: opc = %p: still open",
 			      __func__, (void *)opc);
 		if ((pnd->pnd_flags & PND_BUSY) ||
 		       !TAILQ_EMPTY(&pnd->pnd_pcq))
 			DERRX(EX_SOFTWARE, "%s: opc = %p: ongoing operations",
 			      __func__, (void *)opc);
 #endif
 		/*
 		 * Send the FORGET message
+		 *
 		 * ps_new_msg() is called with NULL creds, which will
 		 * be interpreted as FUSE superuser. This is obviously
 		 * fine since we operate with kernel creds here.
 		 */
 		pm = ps->ps_new_msg(pu, (puffs_cookie_t)pn, FUSE_FORGET,
 			      sizeof(*ffi), NULL);
 		ffi = GET_INPAYLOAD(ps, pm, fuse_forget_in);
-		ffi->nlookup = pnd->pnd_nlookup;
+		ffi->nlookup = pnd->pnd_fuse_nlookup;
 		/*
 		 * No reply is expected, pm is freed in xchg_msg
 		 */
 		(void)xchg_msg(pu, (puffs_cookie_t)pn,
 			       pm, UNSPEC_REPLY_LEN, no_reply);
 		parent_pn = pnd->pnd_parent;
 		perfuse_destroy_pn(pn);
 		pn = parent_pn;
+	}

 @@ -1,14 +1,14 @@
-/*  $NetBSD: perfuse_priv.h,v 1.25 2012/01/29 06:22:02 manu Exp $ */
+/*  $NetBSD: perfuse_priv.h,v 1.26 2012/03/08 14:58:57 manu Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
+ *
 @@ -98,27 +98,28 @@ enum perfuse_qtype {
 extern const char *perfuse_qtypestr[];
 #endif
 struct perfuse_cc_queue {
 	enum perfuse_qtype pcq_type;
 	struct puffs_cc *pcq_cc;
 	TAILQ_ENTRY(perfuse_cc_queue) pcq_next;
 };
 struct perfuse_node_data {
 	uint64_t pnd_rfh;
 	uint64_t pnd_wfh;
 	uint64_t pnd_nodeid;			/* nodeid, this is not inode */
-	uint64_t pnd_nlookup;			/* vnode refcount */
+	uint64_t pnd_fuse_nlookup;		/* vnode refcount */
 	int pnd_puffs_nlookup;			/* vnode refcount */
 	uint64_t pnd_lock_owner;
 	struct dirent *pnd_dirent;		/* native buffer for readdir */
 	off_t pnd_dirent_len;
 	struct fuse_dirent *pnd_all_fd;		/* FUSE buffer for readdir */
 	size_t pnd_all_fd_len;
 	uint64_t pnd_fd_cookie;			/* opaque readdir ref from fs */
 	TAILQ_HEAD(,perfuse_cc_queue) pnd_pcq;	/* queued requests */
 	int pnd_flags;
 #define PND_RECLAIMED		0x001	/* reclaim pending */
 #define PND_INREADDIR		0x002	/* readdir in progress */
 #define PND_DIRTY		0x004	/* There is some data to sync */
 #define PND_RFH			0x008	/* Read FH allocated */
 #define PND_WFH			0x010	/* Write FH allocated */

 @@ -1,14 +1,14 @@
-/*  $NetBSD: subr.c,v 1.15 2012/01/29 06:22:02 manu Exp $ */
+/*  $NetBSD: subr.c,v 1.16 2012/03/08 14:58:57 manu Exp $ */
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
+ *
 @@ -57,27 +57,28 @@ perfuse_new_pn(pu, name, parent)
 	struct puffs_node *pn;
 	struct perfuse_node_data *pnd;
 	if ((pnd = malloc(sizeof(*pnd))) == NULL)
 		DERR(EX_OSERR, "%s: malloc failed", __func__);
 	if ((pn = puffs_pn_new(pu, pnd)) == NULL)
 		DERR(EX_SOFTWARE, "%s: puffs_pn_new failed", __func__);
 	(void)memset(pnd, 0, sizeof(*pnd));
 	pnd->pnd_rfh = FUSE_UNKNOWN_FH;
 	pnd->pnd_wfh = FUSE_UNKNOWN_FH;
 	pnd->pnd_nodeid = PERFUSE_UNKNOWN_NODEID;
-	pnd->pnd_nlookup = 1;
+	pnd->pnd_fuse_nlookup = 1;
 	pnd->pnd_puffs_nlookup = 1;
 	pnd->pnd_parent = parent;
 	pnd->pnd_pn = (puffs_cookie_t)pn;
 	(void)strlcpy(pnd->pnd_name, name, MAXPATHLEN);
 	TAILQ_INIT(&pnd->pnd_pcq);
 	TAILQ_INIT(&pnd->pnd_children);
 	if (parent != NULL) {
 		struct perfuse_node_data *parent_pnd;
 		parent_pnd = PERFUSE_NODE_DATA(parent);
 		TAILQ_INSERT_TAIL(&parent_pnd->pnd_children, pnd, pnd_next);
 		parent_pnd->pnd_childcount++;