Merge branch 'next' into for-linus
James Morris [Mon, 17 May 2010 22:57:00 +0000 (08:57 +1000)]
1  2 
fs/namespace.c
kernel/acct.c

diff --cc 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:
diff --cc kernel/acct.c
Simple merge