linux-next: manual merge of the userns tree with the vfs tree

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the userns tree got a conflict in fs/mount.h
between commits 84550b9356af ("RCU'd vfsmounts") and 474279dc0f77 ("split
__lookup_mnt() in two functions") from the vfs tree and commit
d7e58b8abc4f ("vfs: Add a function to lazily unmount all mounts from any
dentry. v3") from the userns tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/mount.h
index d64c594be6c4,7a6a2bb3f290..000000000000
--- a/fs/mount.h
+++ b/fs/mount.h
@@@ -77,11 -78,9 +79,12 @@@ static inline int is_mounted(struct vfs
  	return !IS_ERR_OR_NULL(real_mount(mnt));
  }
  
 -extern struct mount *__lookup_mnt(struct vfsmount *, struct dentry *, int);
 +extern struct mount *__lookup_mnt(struct vfsmount *, struct dentry *);
 +extern struct mount *__lookup_mnt_last(struct vfsmount *, struct dentry *);
+ extern void detach_mounts(struct dentry *dentry);
  
 +extern bool legitimize_mnt(struct vfsmount *, unsigned);
 +
  static inline void get_mnt_ns(struct mnt_namespace *ns)
  {
  	atomic_inc(&ns->count);

Attachment: pgp00000.pgp
Description: PGP signature