From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 May 2011 16:52:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: MMI-PSA29.97-13-9~19455
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=32e51f141fd8d880f57b6a2eb53ce72856254d4a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (25 commits)
  cifs: remove unnecessary dentry_unhash on rmdir/rename_dir
  ocfs2: remove unnecessary dentry_unhash on rmdir/rename_dir
  exofs: remove unnecessary dentry_unhash on rmdir/rename_dir
  nfs: remove unnecessary dentry_unhash on rmdir/rename_dir
  ext2: remove unnecessary dentry_unhash on rmdir/rename_dir
  ext3: remove unnecessary dentry_unhash on rmdir/rename_dir
  ext4: remove unnecessary dentry_unhash on rmdir/rename_dir
  btrfs: remove unnecessary dentry_unhash in rmdir/rename_dir
  ceph: remove unnecessary dentry_unhash calls
  vfs: clean up vfs_rename_other
  vfs: clean up vfs_rename_dir
  vfs: clean up vfs_rmdir
  vfs: fix vfs_rename_dir for FS_RENAME_DOES_D_MOVE filesystems
  libfs: drop unneeded dentry_unhash
  vfs: update dentry_unhash() comment
  vfs: push dentry_unhash on rename_dir into file systems
  vfs: push dentry_unhash on rmdir into file systems
  vfs: remove dget() from dentry_unhash()
  vfs: dentry_unhash immediately prior to rmdir
  vfs: Block mmapped writes while the fs is frozen
  ...
---

32e51f141fd8d880f57b6a2eb53ce72856254d4a
diff --cc fs/hpfs/namei.c
index 1f05839c27a7,d3db95f51a4e..ff0ce21c0867
--- a/fs/hpfs/namei.c
+++ b/fs/hpfs/namei.c
@@@ -393,9 -410,10 +393,8 @@@ again
  		if (rep++)
  			break;
  
 -		mutex_unlock(&hpfs_i(dir)->i_mutex);
 -		mutex_unlock(&hpfs_i(inode)->i_parent_mutex);
  		dentry_unhash(dentry);
  		if (!d_unhashed(dentry)) {
- 			dput(dentry);
  			hpfs_unlock(dir->i_sb);
  			return -ENOSPC;
  		}
@@@ -442,8 -461,12 +439,10 @@@ static int hpfs_rmdir(struct inode *dir
  	int err;
  	int r;
  
+ 	dentry_unhash(dentry);
+ 
  	hpfs_adjust_length(name, &len);
  	hpfs_lock(dir->i_sb);
 -	mutex_lock(&hpfs_i(inode)->i_parent_mutex);
 -	mutex_lock(&hpfs_i(dir)->i_mutex);
  	err = -ENOENT;
  	de = map_dirent(dir, hpfs_i(dir)->i_dno, name, len, &dno, &qbh);
  	if (!de)