svn commit: r204467 - head/sys/fs/msdosfs

[Konstantin Belousov]

Author: kib
Date: Sun Feb 28 17:09:09 2010
New Revision: 204467
URL: http://svn.freebsd.org/changeset/base/204467

Log:
  Remove seemingly unneeded unlock/relock of the dvp in msdosfs_rmdir,
  causing LOR.
  
  Reported and tested by:	pho
  MFC after:	3 weeks

Modified:
  head/sys/fs/msdosfs/msdosfs_vnops.c

Modified: head/sys/fs/msdosfs/msdosfs_vnops.c
==============================================================================
--- head/sys/fs/msdosfs/msdosfs_vnops.c	Sun Feb 28 17:07:49 2010	(r204466)
+++ head/sys/fs/msdosfs/msdosfs_vnops.c	Sun Feb 28 17:09:09 2010	(r204467)
@@ -1468,14 +1468,12 @@ msdosfs_rmdir(ap)
 	 * the name cache.
 	 */
 	cache_purge(dvp);
-	VOP_UNLOCK(dvp, 0);
 	/*
 	 * Truncate the directory that is being deleted.
 	 */
 	error = detrunc(ip, (u_long)0, IO_SYNC, cnp->cn_cred, td);
 	cache_purge(vp);
 
-	vn_lock(dvp, LK_EXCLUSIVE | LK_RETRY);
 out:
 	return (error);
 }