svn commit: r196203 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Fri Aug 14 10:57:28 2009
New Revision: 196203
URL: http://svn.freebsd.org/changeset/base/196203

Log:
  Correctly handle unlock for !MAKEENTRY case, after successfull attempt of
  lock upgrade cache shall be unlocked from write.
  
  Reported by:	Lucius Windschuh <lwindschuh googlemail com>
  Reviewed by:	kan
  Approved by:	re (rwatson)

Modified:
  head/sys/kern/vfs_cache.c

Modified: head/sys/kern/vfs_cache.c
==============================================================================
--- head/sys/kern/vfs_cache.c	Fri Aug 14 10:25:14 2009	(r196202)
+++ head/sys/kern/vfs_cache.c	Fri Aug 14 10:57:28 2009	(r196203)
@@ -416,7 +416,8 @@ retry_wlocked:
 				if (dvp->v_cache_dd->nc_flag & NCF_ISDOTDOT)
 					cache_zap(dvp->v_cache_dd);
 				dvp->v_cache_dd = NULL;
-				goto unlock;
+				CACHE_WUNLOCK();
+				return (0);
 			}
 			if (dvp->v_cache_dd->nc_flag & NCF_ISDOTDOT)
 				*vpp = dvp->v_cache_dd->nc_vp;