summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivek Goyal <vgoyal@redhat.com>2018-03-09 15:44:43 -0500
committerMiklos Szeredi <mszeredi@redhat.com>2018-04-12 12:04:49 +0200
commit102b0d11cbe83e607a8e9060c05930905332f9ec (patch)
treecd05df92289ee28d57a8ce50d71ed4be6d830b30
parente9b77f90cc2307f6d2457696d3d76288a5df11fc (diff)
ovl: set d->is_dir and d->opaque for last path element
Certain properties in ovl_lookup_data should be set only for the last element of the path. IOW, if we are calling ovl_lookup_single() for an absolute redirect, then d->is_dir and d->opaque do not make much sense for intermediate path elements. Instead set them only if dentry being lookup is last path element. As of now we do not seem to be making use of d->opaque if it is set for a path/dentry in lower. But just define the semantics so that future code can make use of this assumption. Signed-off-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
-rw-r--r--fs/overlayfs/namei.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
index 5287c4bcf14b..0a26b76590d5 100644
--- a/fs/overlayfs/namei.c
+++ b/fs/overlayfs/namei.c
@@ -230,6 +230,7 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
{
struct dentry *this;
int err;
+ bool last_element = !post[0];
this = lookup_one_len_unlocked(name, base, namelen);
if (IS_ERR(this)) {
@@ -257,12 +258,15 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
goto put_and_out;
goto out;
}
- d->is_dir = true;
+ if (last_element)
+ d->is_dir = true;
if (d->last)
goto out;
if (ovl_is_opaquedir(this)) {
- d->stop = d->opaque = true;
+ d->stop = true;
+ if (last_element)
+ d->opaque = true;
goto out;
}
err = ovl_check_redirect(this, d, prelen, post);