[src/trunk]: src/sys/ufs/lfs Merge ufs_rename.c 1.11: ufs_gro_genealogy: use ...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fbb70439d4e5
branches:  trunk
changeset: 816151:fbb70439d4e5
user:      dholland <dholland%NetBSD.org@localhost>
date:      Mon Jun 20 01:20:01 2016 +0000

description:
Merge ufs_rename.c 1.11: ufs_gro_genealogy: use vcache_get() to lookup DOTDOT.

diffstat:

 sys/ufs/lfs/lfs_rename.c |  25 ++++++++++---------------
 1 files changed, 10 insertions(+), 15 deletions(-)

diffs (48 lines):

diff -r 126d9d3a1d39 -r fbb70439d4e5 sys/ufs/lfs/lfs_rename.c
--- a/sys/ufs/lfs/lfs_rename.c  Mon Jun 20 01:06:23 2016 +0000
+++ b/sys/ufs/lfs/lfs_rename.c  Mon Jun 20 01:20:01 2016 +0000
@@ -1,5 +1,5 @@
-/*     $NetBSD: lfs_rename.c,v 1.18 2016/06/20 00:00:47 dholland Exp $ */
-/*  from NetBSD: ufs_rename.c,v 1.10 2014/02/06 10:57:12 hannken Exp  */
+/*     $NetBSD: lfs_rename.c,v 1.19 2016/06/20 01:20:01 dholland Exp $ */
+/*  from NetBSD: ufs_rename.c,v 1.11 2014/05/25 13:45:39 hannken Exp  */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.18 2016/06/20 00:00:47 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_rename.c,v 1.19 2016/06/20 01:20:01 dholland Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -697,20 +697,15 @@
                }
 
                /* 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);
+               error = vcache_get(mp, &dotdot_ino, sizeof(dotdot_no), &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);