Skip to content

Commit

Permalink
ovl: allocate anonymous devs for lowerdirs
Browse files Browse the repository at this point in the history
Generate unique values of st_dev per lower layer for non-samefs
overlay mount. The unique values are obtained by allocating anonymous
bdevs for each of the lowerdirs in the overlayfs instance.

The anonymous bdev is going to be returned by stat(2) for lowerdir
non-dir entries in non-samefs case.

[amir: split from ovl_getattr() and re-structure patches]

Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
  • Loading branch information
Chandan Rajendra authored and Miklos Szeredi committed Nov 9, 2017
1 parent b934363 commit 2a9c6d0
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
1 change: 1 addition & 0 deletions fs/overlayfs/ovl_entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ struct ovl_config {

struct ovl_layer {
struct vfsmount *mnt;
dev_t pseudo_dev;
};

struct ovl_path {
Expand Down
18 changes: 16 additions & 2 deletions fs/overlayfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,10 @@ static void ovl_put_super(struct super_block *sb)
if (ufs->upper_mnt && ufs->upperdir_locked)
ovl_inuse_unlock(ufs->upper_mnt->mnt_root);
mntput(ufs->upper_mnt);
for (i = 0; i < ufs->numlower; i++)
for (i = 0; i < ufs->numlower; i++) {
mntput(ufs->lower_layers[i].mnt);
free_anon_bdev(ufs->lower_layers[i].pseudo_dev);
}
kfree(ufs->lower_layers);

kfree(ufs->config.lowerdir);
Expand Down Expand Up @@ -1032,11 +1034,19 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
goto out_put_workdir;
for (i = 0; i < numlower; i++) {
struct vfsmount *mnt;
dev_t dev;

err = get_anon_bdev(&dev);
if (err) {
pr_err("overlayfs: failed to get anonymous bdev for lowerpath\n");
goto out_put_lower_layers;
}

mnt = clone_private_mount(&stack[i]);
err = PTR_ERR(mnt);
if (IS_ERR(mnt)) {
pr_err("overlayfs: failed to clone lowerpath\n");
free_anon_bdev(dev);
goto out_put_lower_layers;
}
/*
Expand All @@ -1046,6 +1056,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
mnt->mnt_flags |= MNT_READONLY | MNT_NOATIME;

ufs->lower_layers[ufs->numlower].mnt = mnt;
ufs->lower_layers[ufs->numlower].pseudo_dev = dev;
ufs->numlower++;

/* Check if all lower layers are on same sb */
Expand Down Expand Up @@ -1162,8 +1173,11 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
out_free_oe:
kfree(oe);
out_put_lower_layers:
for (i = 0; i < ufs->numlower; i++)
for (i = 0; i < ufs->numlower; i++) {
if (ufs->lower_layers[i].mnt)
free_anon_bdev(ufs->lower_layers[i].pseudo_dev);
mntput(ufs->lower_layers[i].mnt);
}
kfree(ufs->lower_layers);
out_put_workdir:
dput(ufs->workdir);
Expand Down

0 comments on commit 2a9c6d0

Please sign in to comment.