svn commit: r205589 - stable/8/sys/fs/msdosfs

[Konstantin Belousov]

Author: kib
Date: Wed Mar 24 14:13:27 2010
New Revision: 205589
URL: http://svn.freebsd.org/changeset/base/205589

Log:
  MFC r204467:
  Remove seemingly unneeded unlock/relock of the dvp in msdosfs_rmdir,
  causing LOR.

Modified:
  stable/8/sys/fs/msdosfs/msdosfs_vnops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/net/   (props changed)

Modified: stable/8/sys/fs/msdosfs/msdosfs_vnops.c
==============================================================================
--- stable/8/sys/fs/msdosfs/msdosfs_vnops.c	Wed Mar 24 14:10:08 2010	(r205588)
+++ stable/8/sys/fs/msdosfs/msdosfs_vnops.c	Wed Mar 24 14:13:27 2010	(r205589)
@@ -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);
 }