linux-next: manual merge of the userns tree with Linus' tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the userns tree got a conflict in fs/dcache.c
between commit da1ce0670c14 ("vfs: add cross-rename") from Linus' tree
and commit f43d102a391d ("vfs: Lazily remove mounts on unlinked files and
directories") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).  This matches the conflict resolution you sent to Linus.

-- 
Cheers,
Stephen Rothwell                    s...@canb.auug.org.au

diff --cc fs/dcache.c
index 40707d88a945,5b78bd98649c..000000000000
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@@ -2701,10 -2631,8 +2663,8 @@@ static struct dentry *__d_unalias(struc
                goto out_err;
        m2 = &alias->d_parent->d_inode->i_mutex;
  out_unalias:
-       if (likely(!d_mountpoint(alias))) {
-               __d_move(alias, dentry, false);
-               ret = alias;
-       }
 -      __d_move(alias, dentry);
++      __d_move(alias, dentry, false);
+       ret = alias;
  out_err:
        spin_unlock(&inode->i_lock);
        if (m2)

pgpVnxLJHQy6P.pgp
Description: PGP signature