Commit 7c03b5d4 authored by Miklos Szeredi's avatar Miklos Szeredi

ovl: allow distributed fs as lower layer

Allow filesystems with .d_revalidate as lower layer(s), but not as upper
layer.

For local filesystems the rule was that modifications on the layers
directly while being part of the overlay results in undefined behavior.

This can easily be extended to distributed filesystems: we assume the tree
used as lower layer is static, which means ->d_revalidate() should always
return "1".  If that is not the case, return -ESTALE, don't try to work
around the modification.
Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
parent a6f15d9a
...@@ -273,10 +273,57 @@ static void ovl_dentry_release(struct dentry *dentry) ...@@ -273,10 +273,57 @@ static void ovl_dentry_release(struct dentry *dentry)
} }
} }
static int ovl_dentry_revalidate(struct dentry *dentry, unsigned int flags)
{
struct ovl_entry *oe = dentry->d_fsdata;
unsigned int i;
int ret = 1;
for (i = 0; i < oe->numlower; i++) {
struct dentry *d = oe->lowerstack[i].dentry;
if (d->d_flags & DCACHE_OP_REVALIDATE) {
ret = d->d_op->d_revalidate(d, flags);
if (ret < 0)
return ret;
if (!ret) {
if (!(flags & LOOKUP_RCU))
d_invalidate(d);
return -ESTALE;
}
}
}
return 1;
}
static int ovl_dentry_weak_revalidate(struct dentry *dentry, unsigned int flags)
{
struct ovl_entry *oe = dentry->d_fsdata;
unsigned int i;
int ret = 1;
for (i = 0; i < oe->numlower; i++) {
struct dentry *d = oe->lowerstack[i].dentry;
if (d->d_flags & DCACHE_OP_WEAK_REVALIDATE) {
ret = d->d_op->d_weak_revalidate(d, flags);
if (ret <= 0)
break;
}
}
return ret;
}
static const struct dentry_operations ovl_dentry_operations = { static const struct dentry_operations ovl_dentry_operations = {
.d_release = ovl_dentry_release, .d_release = ovl_dentry_release,
}; };
static const struct dentry_operations ovl_reval_dentry_operations = {
.d_release = ovl_dentry_release,
.d_revalidate = ovl_dentry_revalidate,
.d_weak_revalidate = ovl_dentry_weak_revalidate,
};
static struct ovl_entry *ovl_alloc_entry(unsigned int numlower) static struct ovl_entry *ovl_alloc_entry(unsigned int numlower)
{ {
size_t size = offsetof(struct ovl_entry, lowerstack[numlower]); size_t size = offsetof(struct ovl_entry, lowerstack[numlower]);
...@@ -288,6 +335,20 @@ static struct ovl_entry *ovl_alloc_entry(unsigned int numlower) ...@@ -288,6 +335,20 @@ static struct ovl_entry *ovl_alloc_entry(unsigned int numlower)
return oe; return oe;
} }
static bool ovl_dentry_remote(struct dentry *dentry)
{
return dentry->d_flags &
(DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE);
}
static bool ovl_dentry_weird(struct dentry *dentry)
{
return dentry->d_flags & (DCACHE_NEED_AUTOMOUNT |
DCACHE_MANAGE_TRANSIT |
DCACHE_OP_HASH |
DCACHE_OP_COMPARE);
}
static inline struct dentry *ovl_lookup_real(struct dentry *dir, static inline struct dentry *ovl_lookup_real(struct dentry *dir,
struct qstr *name) struct qstr *name)
{ {
...@@ -303,9 +364,9 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir, ...@@ -303,9 +364,9 @@ static inline struct dentry *ovl_lookup_real(struct dentry *dir,
} else if (!dentry->d_inode) { } else if (!dentry->d_inode) {
dput(dentry); dput(dentry);
dentry = NULL; dentry = NULL;
} else if (dentry->d_flags & DCACHE_MANAGED_DENTRY) { } else if (ovl_dentry_weird(dentry)) {
dput(dentry); dput(dentry);
/* Don't support traversing automounts */ /* Don't support traversing automounts and other weirdness */
dentry = ERR_PTR(-EREMOTE); dentry = ERR_PTR(-EREMOTE);
} }
return dentry; return dentry;
...@@ -354,6 +415,11 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, ...@@ -354,6 +415,11 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
goto out; goto out;
if (this) { if (this) {
if (unlikely(ovl_dentry_remote(this))) {
dput(this);
err = -EREMOTE;
goto out;
}
if (ovl_is_whiteout(this)) { if (ovl_is_whiteout(this)) {
dput(this); dput(this);
this = NULL; this = NULL;
...@@ -698,25 +764,6 @@ static void ovl_unescape(char *s) ...@@ -698,25 +764,6 @@ static void ovl_unescape(char *s)
} }
} }
static bool ovl_is_allowed_fs_type(struct dentry *root)
{
const struct dentry_operations *dop = root->d_op;
/*
* We don't support:
* - autofs
* - filesystems with revalidate (FIXME for lower layer)
* - filesystems with case insensitive names
*/
if (dop &&
(dop->d_manage ||
dop->d_revalidate || dop->d_weak_revalidate ||
dop->d_compare || dop->d_hash)) {
return false;
}
return true;
}
static int ovl_mount_dir_noesc(const char *name, struct path *path) static int ovl_mount_dir_noesc(const char *name, struct path *path)
{ {
int err = -EINVAL; int err = -EINVAL;
...@@ -731,7 +778,7 @@ static int ovl_mount_dir_noesc(const char *name, struct path *path) ...@@ -731,7 +778,7 @@ static int ovl_mount_dir_noesc(const char *name, struct path *path)
goto out; goto out;
} }
err = -EINVAL; err = -EINVAL;
if (!ovl_is_allowed_fs_type(path->dentry)) { if (ovl_dentry_weird(path->dentry)) {
pr_err("overlayfs: filesystem on '%s' not supported\n", name); pr_err("overlayfs: filesystem on '%s' not supported\n", name);
goto out_put; goto out_put;
} }
...@@ -755,13 +802,21 @@ static int ovl_mount_dir(const char *name, struct path *path) ...@@ -755,13 +802,21 @@ static int ovl_mount_dir(const char *name, struct path *path)
if (tmp) { if (tmp) {
ovl_unescape(tmp); ovl_unescape(tmp);
err = ovl_mount_dir_noesc(tmp, path); err = ovl_mount_dir_noesc(tmp, path);
if (!err)
if (ovl_dentry_remote(path->dentry)) {
pr_err("overlayfs: filesystem on '%s' not supported as upperdir\n",
tmp);
path_put(path);
err = -EINVAL;
}
kfree(tmp); kfree(tmp);
} }
return err; return err;
} }
static int ovl_lower_dir(const char *name, struct path *path, long *namelen, static int ovl_lower_dir(const char *name, struct path *path, long *namelen,
int *stack_depth) int *stack_depth, bool *remote)
{ {
int err; int err;
struct kstatfs statfs; struct kstatfs statfs;
...@@ -778,6 +833,9 @@ static int ovl_lower_dir(const char *name, struct path *path, long *namelen, ...@@ -778,6 +833,9 @@ static int ovl_lower_dir(const char *name, struct path *path, long *namelen,
*namelen = max(*namelen, statfs.f_namelen); *namelen = max(*namelen, statfs.f_namelen);
*stack_depth = max(*stack_depth, path->mnt->mnt_sb->s_stack_depth); *stack_depth = max(*stack_depth, path->mnt->mnt_sb->s_stack_depth);
if (ovl_dentry_remote(path->dentry))
*remote = true;
return 0; return 0;
out_put: out_put:
...@@ -831,6 +889,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ...@@ -831,6 +889,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
unsigned int numlower; unsigned int numlower;
unsigned int stacklen = 0; unsigned int stacklen = 0;
unsigned int i; unsigned int i;
bool remote = false;
int err; int err;
err = -ENOMEM; err = -ENOMEM;
...@@ -904,7 +963,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ...@@ -904,7 +963,8 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
lower = lowertmp; lower = lowertmp;
for (numlower = 0; numlower < stacklen; numlower++) { for (numlower = 0; numlower < stacklen; numlower++) {
err = ovl_lower_dir(lower, &stack[numlower], err = ovl_lower_dir(lower, &stack[numlower],
&ufs->lower_namelen, &sb->s_stack_depth); &ufs->lower_namelen, &sb->s_stack_depth,
&remote);
if (err) if (err)
goto out_put_lowerpath; goto out_put_lowerpath;
...@@ -962,7 +1022,10 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) ...@@ -962,7 +1022,10 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent)
if (!ufs->upper_mnt) if (!ufs->upper_mnt)
sb->s_flags |= MS_RDONLY; sb->s_flags |= MS_RDONLY;
sb->s_d_op = &ovl_dentry_operations; if (remote)
sb->s_d_op = &ovl_reval_dentry_operations;
else
sb->s_d_op = &ovl_dentry_operations;
err = -ENOMEM; err = -ENOMEM;
oe = ovl_alloc_entry(numlower); oe = ovl_alloc_entry(numlower);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment