ovl: support idmapped layers

Now that overlay is able to take a layers idmapping into account allow
overlay mounts to be created on top of idmapped mounts.

Cc: <[email protected]>
Tested-by: Giuseppe Scrivano <[email protected]>
Reviewed-by: Amir Goldstein <[email protected]>
Signed-off-by: Christian Brauner (Microsoft) <[email protected]>
Signed-off-by: Miklos Szeredi <[email protected]>

diff --git a/fs/overlayfs/ovl_entry.h b/fs/overlayfs/ovl_entry.h
index 469162ca9b213f5cb3bf198c28ea98abbc205ba7..e1af8f66069843c04ab3b4e1c1be384d965a7ecb 100644 (file)
--- a/fs/overlayfs/ovl_entry.h
+++ b/fs/overlayfs/ovl_entry.h
@@ -92,7 +92,7 @@ static inline struct vfsmount *ovl_upper_mnt(struct ovl_fs *ofs)
 
 static inline struct user_namespace *ovl_upper_mnt_userns(struct ovl_fs *ofs)
 {
-       return &init_user_ns;
+       return mnt_user_ns(ovl_upper_mnt(ofs));
 }
 
 static inline struct ovl_fs *OVL_FS(struct super_block *sb)

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index 0123c8086ee96229819eaa278f40954ad4584970..e0a2e0468ee7f1e4bb668df4a9d13cea9d34082b 100644 (file)
--- a/fs/overlayfs/super.c
+++ b/fs/overlayfs/super.c
@@ -874,10 +874,6 @@ static int ovl_mount_dir_noesc(const char *name, struct path *path)
                pr_err("filesystem on '%s' not supported\n", name);
                goto out_put;
        }
-       if (is_idmapped_mnt(path->mnt)) {
-               pr_err("idmapped layers are currently not supported\n");
-               goto out_put;
-       }
        if (!d_is_dir(path->dentry)) {
                pr_err("'%s' not a directory\n", name);
                goto out_put;