mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ovl: add mutli-layer infrastructure

Browse source 
Add multiple lower layers to 'struct ovl_fs' and 'struct ovl_entry'.

ovl_entry will have an array of paths, instead of just the dentry.  This
allows a compact array containing just the layers which exist at current
point in the tree (which is expected to be a small number for the majority
of dentries).

The number of layers is not limited by this infrastructure.

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
This commit is contained in:
Miklos Szeredi 2014-12-13 00:59:43 +01:00
parent 263b4a0fee
commit dd662667e6
1 changed files with 64 additions and 34 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

98
fs/overlayfs/super.c
View file

@ -35,7 +35,8 @@ struct ovl_config {
/* private information held for overlayfs's superblock */ /* private information held for overlayfs's superblock */
struct ovl_fs { struct ovl_fs {
struct vfsmount *upper_mnt; struct vfsmount *upper_mnt;
struct vfsmount *lower_mnt; unsigned numlower;
struct vfsmount **lower_mnt;
struct dentry *workdir; struct dentry *workdir;
long lower_namelen; long lower_namelen;
/* pathnames of lower and upper dirs, for show_options */ /* pathnames of lower and upper dirs, for show_options */
@ -47,7 +48,6 @@ struct ovl_dir_cache;
/* private information held for every overlayfs dentry */ /* private information held for every overlayfs dentry */
struct ovl_entry { struct ovl_entry {
struct dentry *__upperdentry; struct dentry *__upperdentry;
struct dentry *lowerdentry;
struct ovl_dir_cache *cache; struct ovl_dir_cache *cache;
union { union {
struct { struct {
@ -56,10 +56,16 @@ struct ovl_entry {
}; };
struct rcu_head rcu; struct rcu_head rcu;
}; };
unsigned numlower;
struct path lowerstack[];
}; };
const char *ovl_opaque_xattr = "trusted.overlay.opaque"; const char *ovl_opaque_xattr = "trusted.overlay.opaque";
static struct dentry *__ovl_dentry_lower(struct ovl_entry *oe)
{
return oe->numlower ? oe->lowerstack[0].dentry : NULL;
}
enum ovl_path_type ovl_path_type(struct dentry *dentry) enum ovl_path_type ovl_path_type(struct dentry *dentry)
{ {
@ -69,7 +75,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
if (oe->__upperdentry) { if (oe->__upperdentry) {
type = __OVL_PATH_UPPER; type = __OVL_PATH_UPPER;
if (oe->lowerdentry) { if (oe->numlower) {
if (S_ISDIR(dentry->d_inode->i_mode)) if (S_ISDIR(dentry->d_inode->i_mode))
type |= __OVL_PATH_MERGE; type |= __OVL_PATH_MERGE;
} else if (!oe->opaque) { } else if (!oe->opaque) {
@ -117,7 +123,7 @@ struct dentry *ovl_dentry_lower(struct dentry *dentry)
{ {
struct ovl_entry *oe = dentry->d_fsdata; struct ovl_entry *oe = dentry->d_fsdata;
return oe->lowerdentry; return __ovl_dentry_lower(oe);
} }
struct dentry *ovl_dentry_real(struct dentry *dentry) struct dentry *ovl_dentry_real(struct dentry *dentry)
@ -127,7 +133,7 @@ struct dentry *ovl_dentry_real(struct dentry *dentry)
realdentry = ovl_upperdentry_dereference(oe); realdentry = ovl_upperdentry_dereference(oe);
if (!realdentry) if (!realdentry)
realdentry = oe->lowerdentry; realdentry = __ovl_dentry_lower(oe);
return realdentry; return realdentry;
} }
@ -140,7 +146,7 @@ struct dentry *ovl_entry_real(struct ovl_entry *oe, bool *is_upper)
if (realdentry) { if (realdentry) {
*is_upper = true; *is_upper = true;
} else { } else {
realdentry = oe->lowerdentry; realdentry = __ovl_dentry_lower(oe);
*is_upper = false; *is_upper = false;
} }
return realdentry; return realdentry;
@ -162,11 +168,9 @@ void ovl_set_dir_cache(struct dentry *dentry, struct ovl_dir_cache *cache)
void ovl_path_lower(struct dentry *dentry, struct path *path) void ovl_path_lower(struct dentry *dentry, struct path *path)
{ {
struct ovl_fs *ofs = dentry->d_sb->s_fs_info;
struct ovl_entry *oe = dentry->d_fsdata; struct ovl_entry *oe = dentry->d_fsdata;
path->mnt = ofs->lower_mnt; *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
path->dentry = oe->lowerdentry;
} }
int ovl_want_write(struct dentry *dentry) int ovl_want_write(struct dentry *dentry)
@ -258,8 +262,11 @@ static void ovl_dentry_release(struct dentry *dentry)
struct ovl_entry *oe = dentry->d_fsdata; struct ovl_entry *oe = dentry->d_fsdata;
if (oe) { if (oe) {
unsigned int i;
dput(oe->__upperdentry); dput(oe->__upperdentry);
dput(oe->lowerdentry); for (i = 0; i < oe->numlower; i++)
dput(oe->lowerstack[i].dentry);
kfree_rcu(oe, rcu); kfree_rcu(oe, rcu);
} }
} }
@ -268,9 +275,15 @@ static const struct dentry_operations ovl_dentry_operations = {
.d_release = ovl_dentry_release, .d_release = ovl_dentry_release,
}; };
static struct ovl_entry *ovl_alloc_entry(void) static struct ovl_entry *ovl_alloc_entry(unsigned int numlower)
{ {
return kzalloc(sizeof(struct ovl_entry), GFP_KERNEL); size_t size = offsetof(struct ovl_entry, lowerstack[numlower]);
struct ovl_entry *oe = kzalloc(size, GFP_KERNEL);
if (oe)
oe->numlower = numlower;
return oe;
} }
static inline struct dentry *ovl_lookup_real(struct dentry *dir, static inline struct dentry *ovl_lookup_real(struct dentry *dir,
@ -297,19 +310,19 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
{ {
struct ovl_entry *oe; struct ovl_entry *oe;
struct dentry *upperdir; struct dentry *upperdir;
struct dentry *lowerdir; struct path lowerdir;
struct dentry *upperdentry = NULL; struct dentry *upperdentry = NULL;
struct dentry *lowerdentry = NULL; struct dentry *lowerdentry = NULL;
struct inode *inode = NULL; struct inode *inode = NULL;
int err; int err;
err = -ENOMEM; err = -ENOMEM;
oe = ovl_alloc_entry(); oe = ovl_alloc_entry(1);
if (!oe) if (!oe)
goto out; goto out;
upperdir = ovl_dentry_upper(dentry->d_parent); upperdir = ovl_dentry_upper(dentry->d_parent);
lowerdir = ovl_dentry_lower(dentry->d_parent); ovl_path_lower(dentry->d_parent, &lowerdir);
if (upperdir) { if (upperdir) {
upperdentry = ovl_lookup_real(upperdir, &dentry->d_name); upperdentry = ovl_lookup_real(upperdir, &dentry->d_name);
@ -317,7 +330,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
if (IS_ERR(upperdentry)) if (IS_ERR(upperdentry))
goto out_put_dir; goto out_put_dir;
if (lowerdir && upperdentry) { if (lowerdir.dentry && upperdentry) {
if (ovl_is_whiteout(upperdentry)) { if (ovl_is_whiteout(upperdentry)) {
dput(upperdentry); dput(upperdentry);
upperdentry = NULL; upperdentry = NULL;
@ -327,8 +340,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
} }
} }
} }
if (lowerdir && !oe->opaque) { if (lowerdir.dentry && !oe->opaque) {
lowerdentry = ovl_lookup_real(lowerdir, &dentry->d_name); lowerdentry = ovl_lookup_real(lowerdir.dentry, &dentry->d_name);
err = PTR_ERR(lowerdentry); err = PTR_ERR(lowerdentry);
if (IS_ERR(lowerdentry)) if (IS_ERR(lowerdentry))
goto out_dput_upper; goto out_dput_upper;
@ -355,8 +368,12 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
} }
oe->__upperdentry = upperdentry; oe->__upperdentry = upperdentry;
oe->lowerdentry = lowerdentry; if (lowerdentry) {
oe->lowerstack[0].dentry = lowerdentry;
oe->lowerstack[0].mnt = lowerdir.mnt;
} else {
oe->numlower = 0;
}
dentry->d_fsdata = oe; dentry->d_fsdata = oe;
d_add(dentry, inode); d_add(dentry, inode);
@ -380,10 +397,12 @@ struct file *ovl_path_open(struct path *path, int flags)
static void ovl_put_super(struct super_block *sb) static void ovl_put_super(struct super_block *sb)
{ {
struct ovl_fs *ufs = sb->s_fs_info; struct ovl_fs *ufs = sb->s_fs_info;
unsigned i;
dput(ufs->workdir); dput(ufs->workdir);
mntput(ufs->upper_mnt); mntput(ufs->upper_mnt);
mntput(ufs->lower_mnt); for (i = 0; i < ufs->numlower; i++)
mntput(ufs->lower_mnt[i]);
kfree(ufs->config.lowerdir); kfree(ufs->config.lowerdir);
kfree(ufs->config.upperdir); kfree(ufs->config.upperdir);
@ -641,6 +660,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
struct ovl_entry *oe; struct ovl_entry *oe;
struct ovl_fs *ufs; struct ovl_fs *ufs;
struct kstatfs statfs; struct kstatfs statfs;
struct vfsmount *mnt;
unsigned int i;
int err; int err;
err = -ENOMEM; err = -ENOMEM;
@ -661,7 +682,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
} }
err = -ENOMEM; err = -ENOMEM;
oe = ovl_alloc_entry(); oe = ovl_alloc_entry(1);
if (oe == NULL) if (oe == NULL)
goto out_free_config; goto out_free_config;
@ -727,12 +748,24 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
goto out_put_workpath; goto out_put_workpath;
} }
ufs->lower_mnt = clone_private_mount(&lowerpath); ufs->lower_mnt = kcalloc(1, sizeof(struct vfsmount *), GFP_KERNEL);
err = PTR_ERR(ufs->lower_mnt); if (ufs->lower_mnt == NULL)
if (IS_ERR(ufs->lower_mnt)) {
pr_err("overlayfs: failed to clone lowerpath\n");
goto out_put_upper_mnt; goto out_put_upper_mnt;
mnt = clone_private_mount(&lowerpath);
err = PTR_ERR(mnt);
if (IS_ERR(mnt)) {
pr_err("overlayfs: failed to clone lowerpath\n");
goto out_put_lower_mnt;
} }
/*
* Make lower_mnt R/O. That way fchmod/fchown on lower file
* will fail instead of modifying lower fs.
*/
mnt->mnt_flags |= MNT_READONLY;
ufs->lower_mnt[0] = mnt;
ufs->numlower = 1;
ufs->workdir = ovl_workdir_create(ufs->upper_mnt, workpath.dentry); ufs->workdir = ovl_workdir_create(ufs->upper_mnt, workpath.dentry);
err = PTR_ERR(ufs->workdir); err = PTR_ERR(ufs->workdir);
@ -742,12 +775,6 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
goto out_put_lower_mnt; goto out_put_lower_mnt;
} }
/*
* Make lower_mnt R/O. That way fchmod/fchown on lower file
* will fail instead of modifying lower fs.
*/
ufs->lower_mnt->mnt_flags |= MNT_READONLY;
/* If the upper fs is r/o, we mark overlayfs r/o too */ /* If the upper fs is r/o, we mark overlayfs r/o too */
if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY) if (ufs->upper_mnt->mnt_sb->s_flags & MS_RDONLY)
sb->s_flags |= MS_RDONLY; sb->s_flags |= MS_RDONLY;
@ -768,7 +795,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
path_put(&workpath); path_put(&workpath);
oe->__upperdentry = upperpath.dentry; oe->__upperdentry = upperpath.dentry;
oe->lowerdentry = lowerpath.dentry; oe->lowerstack[0].dentry = lowerpath.dentry;
oe->lowerstack[0].mnt = ufs->lower_mnt[0];
root_dentry->d_fsdata = oe; root_dentry->d_fsdata = oe;
@ -782,7 +810,9 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
out_put_workdir: out_put_workdir:
dput(ufs->workdir); dput(ufs->workdir);
out_put_lower_mnt: out_put_lower_mnt:
mntput(ufs->lower_mnt); for (i = 0; i < ufs->numlower; i++)
mntput(ufs->lower_mnt[i]);
kfree(ufs->lower_mnt);
out_put_upper_mnt: out_put_upper_mnt:
mntput(ufs->upper_mnt); mntput(ufs->upper_mnt);
out_put_workpath: out_put_workpath: