From bb6418cbe3e6a838bc7bc76049f6fcb9629f602e Mon Sep 17 00:00:00 2001
From: Alexander Kabaev <kan@FreeBSD.org>
Date: Sat, 4 Apr 2009 17:48:38 +0000
Subject: [PATCH] Revert change 190655 temporarily. It breaks many setups where
 nullfs is used and needs to be revisited.

---
 sys/kern/vfs_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c
index ea19e13b4888..6427f652e842 100644
--- a/sys/kern/vfs_cache.c
+++ b/sys/kern/vfs_cache.c
@@ -971,7 +971,6 @@ vn_vptocnp(struct vnode **vp, char **bp, char *buf, u_int *buflen)
 	vdrop(*vp);
 	VFS_UNLOCK_GIANT(vfslocked);
 	if (error) {
-		CACHE_RLOCK();
 		numfullpathfail2++;
 		return (error);
 	}
@@ -980,6 +979,7 @@ vn_vptocnp(struct vnode **vp, char **bp, char *buf, u_int *buflen)
 	CACHE_RLOCK();
 	if ((*vp)->v_iflag & VI_DOOMED) {
 		/* forced unmount */
+		CACHE_RUNLOCK();
 		vdrop(*vp);
 		return (ENOENT);
 	}