From: James Morris <jmorris@namei.org>
Date: Mon, 17 May 2010 22:57:00 +0000 (+1000)
Subject: Merge branch 'next' into for-linus
X-Git-Tag: MMI-PSA29.97-13-9~23888^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=539c99fd7fc28f8db257c713c10fb4aceadf8887;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'next' into for-linus
---

539c99fd7fc28f8db257c713c10fb4aceadf8887
diff --cc fs/namespace.c
index f20cb57d1067,c36785a2fd86..88058de59c7c
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@@ -1432,14 -1429,9 +1429,9 @@@ static int graft_tree(struct vfsmount *
  
  	err = -ENOENT;
  	mutex_lock(&path->dentry->d_inode->i_mutex);
 -	if (IS_DEADDIR(path->dentry->d_inode))
 +	if (cant_mount(path->dentry))
  		goto out_unlock;
  
- 	err = security_sb_check_sb(mnt, path);
- 	if (err)
- 		goto out_unlock;
- 
- 	err = -ENOENT;
  	if (!d_unlinked(path->dentry))
  		err = attach_recursive_mnt(mnt, path, NULL);
  out_unlock: