svn commit: r190697 - head/sys/kern

[Alexander Kabaev]

Author: kan
Date: Sat Apr  4 17:48:38 2009
New Revision: 190697
URL: http://svn.freebsd.org/changeset/base/190697

Log:
  Revert change 190655 temporarily. It breaks many setups where nullfs is
  used and needs to be revisited.

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Sat Apr  4 17:05:17 2009	(r190696)
+++ head/sys/kern/vfs_cache.c	Sat Apr  4 17:48:38 2009	(r190697)
@@ -971,7 +971,6 @@ vn_vptocnp(struct vnode **vp, char **bp,
 	vdrop(*vp);
 	VFS_UNLOCK_GIANT(vfslocked);
 	if (error) {
-		CACHE_RLOCK();
 		numfullpathfail2++;
 		return (error);
 	}
@@ -980,6 +979,7 @@ vn_vptocnp(struct vnode **vp, char **bp,
 	CACHE_RLOCK();
 	if ((*vp)->v_iflag & VI_DOOMED) {
 		/* forced unmount */
+		CACHE_RUNLOCK();
 		vdrop(*vp);
 		return (ENOENT);
 	}