From a4b8fafa519fc5fad04168499b3aa3890a9cf436 Mon Sep 17 00:00:00 2001
From: hannken <hannken@NetBSD.org>
Date: Sun, 25 May 2014 13:46:58 +0000
Subject: [PATCH] ext2fs_gro_genealogy: use vcache_get() to lookup DOTDOT.

---
 sys/ufs/ext2fs/ext2fs_rename.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/sys/ufs/ext2fs/ext2fs_rename.c b/sys/ufs/ext2fs/ext2fs_rename.c
index 5d2057501af1..6f3360247e9d 100644
--- a/sys/ufs/ext2fs/ext2fs_rename.c
+++ b/sys/ufs/ext2fs/ext2fs_rename.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ext2fs_rename.c,v 1.6 2014/01/28 13:02:56 martin Exp $	*/
+/*	$NetBSD: ext2fs_rename.c,v 1.7 2014/05/25 13:46:58 hannken Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_rename.c,v 1.6 2014/01/28 13:02:56 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_rename.c,v 1.7 2014/05/25 13:46:58 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/buf.h>
@@ -846,20 +846,15 @@ ext2fs_gro_genealogy(struct mount *mp, kauth_cred_t cred,
 		}
 
 		/* Neither -- keep ascending the family tree.  */
-
-		/*
-		 * Unlock vp so that we can lock the parent, but keep
-		 * vp referenced until after we have found the parent,
-		 * so that dotdot_ino will not be recycled.
-		 *
-		 * XXX This guarantees that vp's inode number will not
-		 * be recycled, but why can't dotdot_ino be recycled?
-		 */
-		VOP_UNLOCK(vp);
-		error = VFS_VGET(mp, dotdot_ino, &dvp);
-		vrele(vp);
-		if (error)
+		error = vcache_get(mp, &dotdot_ino, sizeof(dotdot_ino), &dvp);
+		vput(vp);
+		if (error)  
 			return error;
+		error = vn_lock(dvp, LK_EXCLUSIVE);
+		if (error) {
+			vrele(dvp);
+			return error;
+		}
 
 		KASSERT(dvp != NULL);
 		KASSERT(VOP_ISLOCKED(dvp) == LK_EXCLUSIVE);