tmpfs: Fix recursive fdvp lock in rename

PR: kern/159418
glk · Aug 10, 2011 · 15186db · 15186db
1 parent 3391d5c
commit 15186db
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/sys/fs/tmpfs/tmpfs_vnops.c b/sys/fs/tmpfs/tmpfs_vnops.c
@@ -968,7 +968,7 @@ tmpfs_rename(struct vop_rename_args *v)
 
 	/* If we need to move the directory between entries, lock the
 	 * source so that we can safely operate on it. */
-	if (tdvp != fdvp) {
+	if (fdvp != tdvp && fdvp != tvp) {
 		error = vn_lock(fdvp, LK_EXCLUSIVE | LK_RETRY);
 		if (error != 0)
 			goto out;
@@ -1145,7 +1145,7 @@ tmpfs_rename(struct vop_rename_args *v)
 	error = 0;
 
 out_locked:
-	if (fdnode != tdnode)
+	if (fdvp != tdvp && fdvp != tvp)
 		VOP_UNLOCK(fdvp, 0);
 
 out: