 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_subr.c,v 1.95 2009/06/24 17:09:13 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.96 2009/06/25 17:16:33 reinoud Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * 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.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.95 2009/06/24 17:09:13 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.96 2009/06/25 17:16:33 reinoud Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 @@ -3363,41 +3363,48 @@ udf_read_rootdirs(struct udf_mount *ump)
 /* --------------------------------------------------------------------- */
 /* To make absolutely sure we are NOT returning zero, add one :) */
 long
 udf_calchash(struct long_ad *icbptr)
+{
 	/* ought to be enough since each mountpoint has its own chain */
 	return udf_rw32(icbptr->loc.lb_num) + 1;
+}
 int
 udf_check_icb_equal(struct long_ad *a, struct long_ad *b)
+{
 	return (a->loc.lb_num   == b->loc.lb_num &&
 	    a->loc.part_num == b->loc.part_num);
+}
 static struct udf_node *
 udf_hash_lookup(struct udf_mount *ump, struct long_ad *icbptr)
+{
 	struct udf_node *node;
 	struct vnode *vp;
 	uint32_t hashline;
 loop:
 	mutex_enter(&ump->ihash_lock);
 	hashline = udf_calchash(icbptr) & UDF_INODE_HASHMASK;
 	LIST_FOREACH(node, &ump->udf_nodes[hashline], hashchain) {
 		assert(node);
-		if (node->loc.loc.lb_num   == icbptr->loc.lb_num &&
+		if (udf_check_icb_equal(&node->loc, icbptr)) {
 		    node->loc.loc.part_num == icbptr->loc.part_num) {
 			vp = node->vnode;
 			assert(vp);
 			mutex_enter(&vp->v_interlock);
 			mutex_exit(&ump->ihash_lock);
 			if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK))
 				goto loop;
 			return node;
+		}
+	}
 	mutex_exit(&ump->ihash_lock);
 	return NULL;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_subr.h,v 1.15 2009/06/24 17:09:13 reinoud Exp $ */
+/* $NetBSD: udf_subr.h,v 1.16 2009/06/25 17:16:33 reinoud Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * 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.
 @@ -173,26 +173,27 @@ int udf_dir_detach(struct udf_mount *ump
 int udf_dir_attach(struct udf_mount *ump, struct udf_node *dir_node, struct udf_node *udf_node, struct vattr *vap, struct componentname *cnp);
 int udf_dir_update_rootentry(struct udf_mount *ump, struct udf_node *dir_node, struct udf_node *new_parent_node);
 /* update and times */
 void udf_add_to_dirtylist(struct udf_node *udf_node);
 void udf_remove_from_dirtylist(struct udf_node *udf_node);
 void udf_itimes(struct udf_node *udf_node, struct timespec *acc,
 	struct timespec *mod, struct timespec *birth);
 int  udf_update(struct vnode *node, struct timespec *acc,
 	struct timespec *mod, struct timespec *birth, int updflags);
 /* helpers and converters */
 long udf_calchash(struct long_ad *icbptr);    /* for `inode' numbering */
 int udf_check_icb_equal(struct long_ad *a, struct long_ad *b);
 uint32_t udf_getaccessmode(struct udf_node *node);
 void udf_setaccessmode(struct udf_node *udf_node, mode_t mode);
 void udf_getownership(struct udf_node *udf_node, uid_t *uidp, gid_t *gidp);
 void udf_setownership(struct udf_node *udf_node, uid_t uid, gid_t gid);
 void udf_to_unix_name(char *result, int result_len, char *id, int len, struct charspec *chsp);
 void unix_to_udf_name(char *result, uint8_t *result_len, char const *name, int name_len, struct charspec *chsp);
 void udf_timestamp_to_timespec(struct udf_mount *ump, struct timestamp *timestamp, struct timespec *timespec);
 void udf_timespec_to_timestamp(struct timespec *timespec, struct timestamp *timestamp);
 /* vnode operations */
 int udf_inactive(void *v);

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_vnops.c,v 1.46 2009/06/24 17:09:13 reinoud Exp $ */
+/* $NetBSD: udf_vnops.c,v 1.47 2009/06/25 17:16:33 reinoud Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * 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.
 @@ -22,27 +22,27 @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * Generic parts are derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal, developed as part of Google's Summer of Code
  * 2005 program.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.46 2009/06/24 17:09:13 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_vnops.c,v 1.47 2009/06/25 17:16:33 reinoud Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/namei.h>
 #include <sys/resourcevar.h>	/* defines plimit structure in proc struct */
 #include <sys/kernel.h>
 #include <sys/file.h>		/* define FWRITE ... */
 #include <sys/stat.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
 #include <sys/mount.h>
 @@ -1815,75 +1815,118 @@ udf_readlink(void *v)
 	/* uiomove() to destination */
 	if (!error)
 		uiomove(targetbuf, PATH_MAX - targetlen, uio);
 	free(pathbuf, M_UDFTEMP);
 	free(targetbuf, M_UDFTEMP);
 	free(tmpname, M_UDFTEMP);
 	return error;
+}
 /* --------------------------------------------------------------------- */
 /*
  * Check if source directory is in the path of the target directory.  Target
  * is supplied locked, source is unlocked. The target is always vput before
  * returning. Modeled after UFS.
+ *
  * If source is on the path from target to the root, return error.
  */
 static int
-udf_on_rootpath(struct udf_node *fnode, struct udf_node *tdnode)
+udf_on_rootpath(struct udf_node *source, struct udf_node *target)
+{
-	struct udf_mount *ump = tdnode->ump;
+	struct udf_mount *ump = target->ump;
 	struct udf_node *res_node;
-	struct long_ad icb_loc;
+	struct long_ad icb_loc, *root_icb;
 	const char *name;
 	int namelen;
 	int error, found;
-	/* if fnode is on the path from tdnode to the root, return error */
+	name     = "..";
-	name    = "..";
+	namelen  = 2;
-	namelen = 2;
+	error    = 0;
-	while (fnode != tdnode) {
+	res_node = target;
 		DPRINTF(NODE, ("udf_on_rootpath : fnode %p, tdnode %p\n",
-			fnode, tdnode));
+	root_icb   = &ump->fileset_desc->rootdir_icb;
 		if (tdnode->vnode->v_vflag & VV_ROOT) {
-			/* found root, accept */
+	/* if nodes are equal, it is no use looking */
-			/* DPRINTF(NODE, ("\tCOUGHT, pre-vput\n")); */
+	if (udf_check_icb_equal(&source->loc, &target->loc)) {
-			vput(tdnode->vnode);
+		error = EEXIST;
-			DPRINTF(NODE, ("\tCOUGHT: valid\n"));
+		goto out;
 			return 0;
 	/* nothing can exist before the root */
 	if (udf_check_icb_equal(root_icb, &target->loc)) {
 		error = 0;
 		goto out;
+	}
 	for (;;) {
 		DPRINTF(NODE, ("udf_on_rootpath : "
 			"source vp %p, looking at vp %p\n",
 			source->vnode, res_node->vnode));
 		/* sanity check */
 		if (res_node->vnode->v_type != VDIR) {
 			error = ENOTDIR;
 			goto out;
+		}
 		/* go down one level */
-		error = udf_lookup_name_in_dir(tdnode->vnode, name, namelen,
+		error = udf_lookup_name_in_dir(res_node->vnode, name, namelen,
 			&icb_loc, &found);
 		DPRINTF(NODE, ("\tlookup of '..' resulted in error %d, "
 			"found %d\n", error, found));
 		/* DPRINTF(NODE, ("\tvput %p\n", tdnode->vnode)); */
 		vput(tdnode->vnode);
-		if (error)	/* now what? bail out */
+		if (!found)
-			return EINVAL;
+			error = ENOENT;
-		if (!found)	/* unlikely */
+		if (error)
-			return EINVAL;
+			goto out;
-		DPRINTF(NODE, ("\tgetting .. node\n"));
+		/* did we encounter source node? */
 		if (udf_check_icb_equal(&icb_loc, &source->loc)) {
 			error = EINVAL;
 			goto out;
+		}
 		/* did we encounter the root node? */
 		if (udf_check_icb_equal(&icb_loc, root_icb)) {
 			error = 0;
 			goto out;
+		}
 		/* push our intermediate node, we're done with it */
 		/* DPRINTF(NODE, ("\tvput %p\n", target->vnode)); */
 		vput(res_node->vnode);
 		DPRINTF(NODE, ("\tgetting the .. node\n"));
 		error = udf_get_node(ump, &icb_loc, &res_node);
 		DPRINTF(NODE, ("\treported error %d\n", error));
 		if (error)	/* argh, bail out */
 			return EINVAL;
-		tdnode = res_node;
+		if (error) {	/* argh, bail out */
 			KASSERT(res_node == NULL);
 			// res_node = NULL;
 			goto out;
+		}
+	}
-	DPRINTF(NODE, ("\tCOUGHT: invalid\n"));
+out:
-	vput(tdnode->vnode);
+	DPRINTF(NODE, ("\tresult: %svalid, error = %d\n", error?"in":"", error));
-	return EINVAL;
+	/* put our last node */
 	if (res_node)
 		vput(res_node->vnode);
 	return error;
+}
 /* note: i tried to follow the logics of the tmpfs rename code */
 int
 udf_rename(void *v)
+{
 	struct vop_rename_args /* {
 		struct vnode *a_fdvp;
 		struct vnode *a_fvp;
 		struct componentname *a_fcnp;
 		struct vnode *a_tdvp;
 		struct vnode *a_tvp;
 		struct componentname *a_tcnp;
 @@ -1940,35 +1983,58 @@ udf_rename(void *v)
 		if (fvp->v_type == VDIR && tvp->v_type != VDIR) {
 			error = ENOTDIR;
 			goto out;
+		}
 		/* if we're moving a non-directory, make sure dest is no dir */
 		if (fvp->v_type != VDIR && tvp->v_type == VDIR) {
 			error = EISDIR;
 			goto out;
+		}
+	}
 	/* check if moving a directory to a new parent is allowed */
 	if ((fdnode != tdnode) && (fvp->v_type == VDIR)) {
 		/* release tvp since we might encounter it and lock up */
 		if (tvp)
 			vput(tvp);
 		/* vref tdvp since we lose its ref in udf_on_rootpath */
 		vref(tdvp);
 		/* search if fnode is a component of tdnode's path to root */
 		error = udf_on_rootpath(fnode, tdnode);
 		DPRINTF(NODE, ("Dir rename allowed ? %s\n", error ? "NO":"YES"));
-		/* tdnode is vput()'ed, relock */
+		if (error) {
-		(void) vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY);
+			/* compensate for our vref earlier */
 			vrele(tdvp);
 			goto out;
+		}
 		/* relock tdvp; its still here due to the vref earlier */
 		vn_lock(tdvp, LK_EXCLUSIVE | LK_RETRY);
-		if (error)
+		/*
 		 * re-lookup tvp since the parent has been unlocked, so could
 		 * have changed/removed in the meantime.
 		 */
 		tcnp->cn_flags &= ~SAVESTART;
 		error = relookup(tdvp, &tvp, tcnp);
 		if (error) {
 			vput(tdvp);
 			goto out;
+		}
 		tnode  = (tvp == NULL) ? NULL : VTOI(tvp);
+	}
 	/* remove existing entry if present */
 	if (tvp)
 		udf_dir_detach(tdnode->ump, tdnode, tnode, tcnp);
 	/* create new directory entry for the node */
 	error = udf_dir_attach(tdnode->ump, tdnode, fnode, &fvap, tcnp);
 	if (error)
 		goto out;
 	/* unlink old directory entry for the node, if failing, unattach new */
 	error = udf_dir_detach(tdnode->ump, fdnode, fnode, fcnp);