 @@ -1,14 +1,14 @@
-/*	$NetBSD: p2k.c,v 1.45 2010/11/26 11:12:06 pooka Exp $	*/
+/*	$NetBSD: p2k.c,v 1.46 2010/11/30 10:49:22 dholland Exp $	*/
 /*
  * Copyright (c) 2007, 2008, 2009  Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * 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
 @@ -686,37 +686,37 @@ p2k_node_lookup(struct puffs_usermount *
 		 * without SAVESTART 3) RENAME.  Hold on to this like
 		 * it were the absolute truth for now.  However, do
 		 * not sprinkle asserts based on this due to abovementioned
 		 * brokenness -- some file system drivers might not
 		 * even issue ABORT properly, so just free resources
 		 * on the fly and hope for the best.  PR kern/42348
 		 */
 		if (pcn->pcn_flags & RUMP_NAMEI_INRENAME) {
 			if (pcn->pcn_nameiop == RUMP_NAMEI_DELETE) {
 				/* save path from the first lookup */
 				if (pcn->pcn_flags & RUMP_NAMEI_SAVESTART) {
 					if (p2n_dir->p2n_cn_ren_src)
 						freecn(p2n_dir->p2n_cn_ren_src,
-						    RUMPCN_FORCEFREE);
+);
 					p2n_dir->p2n_cn_ren_src = cn;
 				} else {
-					freecn(cn, RUMPCN_FORCEFREE);
+					freecn(cn, 0);
 					cn = NULL;
+				}
 			} else {
 				assert(pcn->pcn_nameiop == RUMP_NAMEI_RENAME);
 				if (p2n_dir->p2n_cn_ren_targ)
 					freecn(p2n_dir->p2n_cn_ren_targ,
-					    RUMPCN_FORCEFREE);
+);
 				p2n_dir->p2n_cn_ren_targ = cn;
+			}
 		} else {
 			assert(p2n_dir->p2n_cn == NULL);
 			p2n_dir->p2n_cn = cn;
+		}
 	} else {
 		freecn(cn, 0);
 		cn = NULL;
+	}
 	if (rv) {
 		if (rv == EJUSTRETURN) {
 			rv = ENOENT;
 @@ -793,27 +793,27 @@ do_makenode(struct puffs_usermount *pu,
 	struct vattr *va_x;
 	struct vnode *vp;
 	int rv;
 	p2n = malloc(sizeof(*p2n));
 	if (p2n == NULL)
 		return ENOMEM;
 	DOCOMPAT(vap, va_x);
 	if (p2n_dir->p2n_cn) {
 		cn = p2n_dir->p2n_cn;
 		p2n_dir->p2n_cn = NULL;
 	} else {
-		cn = makecn(pcn, RUMP_NAMEI_HASBUF);
+		cn = makecn(pcn, 0);
+	}
 	RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
 	rump_pub_vp_incref(dvp);
 	if (makefn) {
 		rv = makefn(dvp, &vp, cn, va_x);
 	} else {
 		rv = symfn(dvp, &vp, cn, va_x, link_target);
+	}
 	assert(RUMP_VOP_ISLOCKED(dvp) == 0);
 	freecn(cn, 0);
 	if (rv == 0) {
 @@ -1022,51 +1022,51 @@ p2k_node_seek(struct puffs_usermount *pu
 /*ARGSUSED*/
 int
 p2k_node_abortop(struct puffs_usermount *pu, puffs_cookie_t opc,
 	const struct puffs_cn *pcn)
+{
 	struct p2k_node *p2n_dir = opc;
 	struct componentname *cnp;
 	if ((cnp = p2n_dir->p2n_cn) != NULL) {
 		freecn(cnp, 0);
 		p2n_dir->p2n_cn = NULL;
+	}
 	if ((cnp = p2n_dir->p2n_cn_ren_src) != NULL) {
-		freecn(cnp, RUMPCN_FORCEFREE);
+		freecn(cnp, 0);
 		p2n_dir->p2n_cn_ren_src = NULL;
+	}
 	if ((cnp = p2n_dir->p2n_cn_ren_targ) != NULL) {
-		freecn(cnp, RUMPCN_FORCEFREE);
+		freecn(cnp, 0);
 		p2n_dir->p2n_cn_ren_targ = NULL;
+	}
 	return 0;
+}
 static int
 do_nukenode(struct p2k_node *p2n_dir, struct p2k_node *p2n,
 	const struct puffs_cn *pcn,
 	int (*nukefn)(struct vnode *, struct vnode *, struct componentname *))
+{
 	struct vnode *dvp = p2n_dir->p2n_vp, *vp = p2n->p2n_vp;
 	struct componentname *cn;
 	int rv;
 	if (p2n_dir->p2n_cn) {
 		cn = p2n_dir->p2n_cn;
 		p2n_dir->p2n_cn = NULL;
 	} else {
-		cn = makecn(pcn, RUMP_NAMEI_HASBUF);
+		cn = makecn(pcn, 0);
+	}
 	RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
 	rump_pub_vp_incref(dvp);
 	RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
 	rump_pub_vp_incref(vp);
 	rv = nukefn(dvp, vp, cn);
 	assert(RUMP_VOP_ISLOCKED(dvp) == 0);
 	assert(RUMP_VOP_ISLOCKED(vp) == 0);
 	freecn(cn, 0);
 	return rv;
 @@ -1085,27 +1085,27 @@ p2k_node_remove(struct puffs_usermount *
 int
 p2k_node_link(struct puffs_usermount *pu, puffs_cookie_t opc,
 	puffs_cookie_t targ, const struct puffs_cn *pcn)
+{
 	struct vnode *dvp = OPC2VP(opc);
 	struct p2k_node *p2n_dir = opc;
 	struct componentname *cn;
 	int rv;
 	if (p2n_dir->p2n_cn) {
 		cn = p2n_dir->p2n_cn;
 		p2n_dir->p2n_cn = NULL;
 	} else {
-		cn = makecn(pcn, RUMP_NAMEI_HASBUF);
+		cn = makecn(pcn, 0);
+	}
 	RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
 	rump_pub_vp_incref(dvp);
 	rv = RUMP_VOP_LINK(dvp, OPC2VP(targ), cn);
 	freecn(cn, 0);
 	return rv;
+}
 /*ARGSUSED*/
 int
 p2k_node_rename(struct puffs_usermount *pu,
 @@ -1113,58 +1113,58 @@ p2k_node_rename(struct puffs_usermount *
 	const struct puffs_cn *pcn_src,
 	puffs_cookie_t targ_dir, puffs_cookie_t targ,
 	const struct puffs_cn *pcn_targ)
+{
 	struct p2k_node *p2n_srcdir = src_dir, *p2n_targdir = targ_dir;
 	struct vnode *dvp, *vp, *tdvp, *tvp = NULL;
 	struct componentname *cn_src, *cn_targ;
 	int rv;
 	if (p2n_srcdir->p2n_cn_ren_src) {
 		cn_src = p2n_srcdir->p2n_cn_ren_src;
 		p2n_srcdir->p2n_cn_ren_src = NULL;
 	} else {
-		cn_src = makecn(pcn_src, RUMP_NAMEI_HASBUF);
+		cn_src = makecn(pcn_src, 0);
+	}
 	if (p2n_targdir->p2n_cn_ren_targ) {
 		cn_targ = p2n_targdir->p2n_cn_ren_targ;
 		p2n_targdir->p2n_cn_ren_targ = NULL;
 	} else {
-		cn_targ = makecn(pcn_targ, RUMP_NAMEI_HASBUF);
+		cn_targ = makecn(pcn_targ, 0);
+	}
 	dvp = OPC2VP(src_dir);
 	vp = OPC2VP(src);
 	tdvp = OPC2VP(targ_dir);
 	if (targ) {
 		tvp = OPC2VP(targ);
+	}
 	rump_pub_vp_incref(dvp);
 	rump_pub_vp_incref(vp);
 	RUMP_VOP_LOCK(tdvp, LK_EXCLUSIVE);
 	rump_pub_vp_incref(tdvp);
 	if (tvp) {
 		RUMP_VOP_LOCK(tvp, LK_EXCLUSIVE);
 		rump_pub_vp_incref(tvp);
+	}
 	rv = RUMP_VOP_RENAME(dvp, vp, cn_src, tdvp, tvp, cn_targ);
 	assert(RUMP_VOP_ISLOCKED(tdvp) == 0);
 	if (tvp) {
 		assert(RUMP_VOP_ISLOCKED(tvp) == 0);
+	}
-	freecn(cn_src, RUMPCN_FORCEFREE);
+	freecn(cn_src, 0);
-	freecn(cn_targ, RUMPCN_FORCEFREE);
+	freecn(cn_targ, 0);
 	return rv;
+}
 /*ARGSUSED*/
 int
 p2k_node_mkdir(struct puffs_usermount *pu, puffs_cookie_t opc,
 	struct puffs_newinfo *pni, const struct puffs_cn *pcn,
 	const struct vattr *vap)
+{
 	return do_makenode(pu, opc, pni, pcn, vap, NULL, RUMP_VOP_MKDIR, NULL);
+}