 @@ -1,14 +1,14 @@
-/*	$NetBSD: p2k.c,v 1.50 2011/01/07 10:18:06 pooka Exp $	*/
+/*	$NetBSD: p2k.c,v 1.51 2011/01/07 11:15:30 pooka 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
 @@ -75,36 +75,26 @@ struct p2k_mount {
 	struct vnode *p2m_rvp;
 	struct puffs_usermount *p2m_pu;
 	struct ukfs *p2m_ukfs;
 	struct p2k_vp_hash p2m_vphash[NHASHBUCK];
 	struct mount *p2m_mp;
 	int p2m_nvnodes;
 	int p2m_imtmpfsman;
 	bool p2m_hasdebug;
 };
 struct p2k_node {
 	struct vnode *p2n_vp;
 	/*
 	 * Ok, then, uhm, we need .. *drumroll*.. two componentname
 	 * storages for rename.  This is because the source dir is
 	 * unlocked after the first lookup, and someone else might
 	 * race in here.  However, we know it's not another rename
 	 * because of the kernel rename lock.  And we need two since
 	 * srcdir and targdir might be the same.  It's a wonderful world.
 	 */
 	struct componentname *p2n_cn_ren_src, *p2n_cn_ren_targ;
 	LIST_ENTRY(p2k_node) p2n_entries;
 };
 #define OPC2VP(opc) (((struct p2k_node *)opc)->p2n_vp)
 static int haswizard;
 static uid_t wizarduid;
 static struct kauth_cred *
 cred_create(const struct puffs_cred *pcr)
+{
 	gid_t groups[NGROUPS];
 	uid_t uid;
 @@ -294,27 +284,26 @@ p2k_init(uint32_t puffs_flags)
 	PUFFSOP_SET(pops, p2k, node, rename);
 	PUFFSOP_SET(pops, p2k, node, mkdir);
 	PUFFSOP_SET(pops, p2k, node, rmdir);
 	PUFFSOP_SET(pops, p2k, node, symlink);
 	PUFFSOP_SET(pops, p2k, node, readdir);
 	PUFFSOP_SET(pops, p2k, node, readlink);
 	PUFFSOP_SET(pops, p2k, node, read);
 	PUFFSOP_SET(pops, p2k, node, write);
 	PUFFSOP_SET(pops, p2k, node, pathconf);
 	PUFFSOP_SET(pops, p2k, node, inactive);
 	PUFFSOP_SET(pops, p2k, node, reclaim);
 	PUFFSOP_SET(pops, p2k, node, abortop);
 	PUFFSOP_SET(pops, p2k, node, getextattr);
 	PUFFSOP_SET(pops, p2k, node, setextattr);
 	PUFFSOP_SET(pops, p2k, node, listextattr);
 	PUFFSOP_SET(pops, p2k, node, deleteextattr);
 	dodaemon = true;
 	hasdebug = false;
 	if (getenv("P2K_DEBUG") != NULL) {
 		puffs_flags |= PUFFS_FLAG_OPDUMP;
 		dodaemon = false;
 		hasdebug = true;
 @@ -667,77 +656,38 @@ p2k_node_lookup(struct puffs_usermount *
 	struct p2k_mount *p2m = puffs_getspecific(pu);
 	struct p2k_node *p2n_dir = opc, *p2n;
 	struct componentname *cn;
 	struct vnode *dvp = p2n_dir->p2n_vp, *vp;
 	enum vtype vtype;
 	voff_t vsize;
 	uint64_t rdev; /* XXX: uint64_t because of stack overwrite in compat */
 	int rv;
 	cn = makecn(pcn);
 	RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
 	rv = RUMP_VOP_LOOKUP(dvp, &vp, cn);
 	RUMP_VOP_UNLOCK(dvp);
 	freecn(cn);
 	/*
 	 * XXX the rename lookup protocol is currently horribly
 	 * broken.  We get 1) DELETE 2) DELETE with INRELOOKUP
 	 * 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_INRELOOKUP) == 0) {
 				if (p2n_dir->p2n_cn_ren_src)
 					freecn(p2n_dir->p2n_cn_ren_src);
 				p2n_dir->p2n_cn_ren_src = cn;
 			} else {
 				freecn(cn);
 				cn = NULL;
 		} else {
 			assert(pcn->pcn_nameiop == RUMP_NAMEI_RENAME);
 			if (p2n_dir->p2n_cn_ren_targ)
 				freecn(p2n_dir->p2n_cn_ren_targ);
 			p2n_dir->p2n_cn_ren_targ = cn;
 	} else {
 		freecn(cn);
 	if (rv) {
 		if (rv == EJUSTRETURN) {
 			rv = ENOENT;
+		}
 		return rv;
+	}
 	RUMP_VOP_UNLOCK(vp);
 	p2n = getp2n(p2m, vp, false, NULL);
 	if (p2n == NULL) {
 		if (pcn->pcn_flags & RUMP_NAMEI_INRENAME) {
 			if (pcn->pcn_nameiop == RUMP_NAMEI_DELETE) {
 				p2n_dir->p2n_cn_ren_src = NULL;
 			} else {
 				p2n_dir->p2n_cn_ren_targ = NULL;
 			RUMP_VOP_ABORTOP(dvp, cn);
 		return ENOMEM;
+	}
 	puffs_newinfo_setcookie(pni, p2n);
 	rump_pub_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
 	puffs_newinfo_setvtype(pni, vtype);
 	puffs_newinfo_setsize(pni, vsize);
 	/* LINTED: yea, it'll lose accuracy, but that's life */
 	puffs_newinfo_setrdev(pni, rdev);
 	return 0;
+}
 @@ -993,46 +943,26 @@ p2k_node_seek(struct puffs_usermount *pu
 	struct vnode *vp = OPC2VP(opc);
 	struct kauth_cred *cred;
 	int rv;
 	cred = cred_create(pcr);
 	RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
 	rv = RUMP_VOP_SEEK(vp, oldoff, newoff, cred);
 	RUMP_VOP_UNLOCK(vp);
 	cred_destroy(cred);
 	return rv;
+}
 /*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_ren_src) != NULL) {
 		freecn(cnp);
 		p2n_dir->p2n_cn_ren_src = NULL;
 	if ((cnp = p2n_dir->p2n_cn_ren_targ) != NULL) {
 		freecn(cnp);
 		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;
 	cn = makecn(pcn);
 	RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
 	rump_pub_vp_incref(dvp);
 	RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
 @@ -1071,44 +1001,32 @@ p2k_node_link(struct puffs_usermount *pu
 	freecn(cn);
 	return rv;
+}
 /*ARGSUSED*/
 int
 p2k_node_rename(struct puffs_usermount *pu,
 	puffs_cookie_t src_dir, puffs_cookie_t src,
 	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 = makecn(pcn_src);
-		cn_src = p2n_srcdir->p2n_cn_ren_src;
+	cn_targ = makecn(pcn_targ);
 		p2n_srcdir->p2n_cn_ren_src = NULL;
 	} else {
 		cn_src = makecn(pcn_src);
 	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);
 	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) {