Skip to content

Commit

Permalink
ovl: support idmapped layers
Browse files Browse the repository at this point in the history
Now that overlay is able to take a layers idmapping into account allow
overlay mounts to be created on top of idmapped mounts.

Cc: <linux-unionfs@vger.kernel.org>
Tested-by: Giuseppe Scrivano <gscrivan@redhat.com>
Reviewed-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Christian Brauner (Microsoft) <brauner@kernel.org>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Christian Brauner authored and Miklos Szeredi committed Apr 28, 2022
1 parent 8bc0095 commit bc70682
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion fs/overlayfs/ovl_entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 0 additions & 4 deletions fs/overlayfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit bc70682

Please sign in to comment.