On Thu, Mar 29, 2018 at 10:38 PM, Vivek Goyal <vgoyal@xxxxxxxxxx> wrote:
> Right now we rely on path based lookup for data origin of metacopy upper.
> This will work only if upper has not been renamed. We solved this problem
> already for merged directories using redirect. Use same logic for metacopy
> files.
>
> This patch just goes on to check redirects for metacopy files.
>
The patch changes the logic very subtly, but it is really hard to
follow because of convoluted diff. Please make changes that don't
change logic in a separate patch.
> Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
> ---
> fs/overlayfs/namei.c | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/fs/overlayfs/namei.c b/fs/overlayfs/namei.c
> index 1dba89e9543f..a7a9588f64b7 100644
> --- a/fs/overlayfs/namei.c
> +++ b/fs/overlayfs/namei.c
> @@ -260,18 +260,19 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,
> goto out_err;
> d->stop = !err;
> d->metacopy = !!err;
> - goto out;
> - }
> - if (last_element)
> - d->is_dir = true;
> - if (d->last)
> - goto out;
> -
> - if (ovl_is_opaquedir(this)) {
> - d->stop = true;
> + if (!d->metacopy)
> + goto out;
> + } else {
> if (last_element)
> - d->opaque = true;
> - goto out;
> + d->is_dir = true;
> + if (d->last)
> + goto out;
If I am not mistaken, d->last test is relevant to both did and non-dir,
because it also prevents the unneeded check redirect.
Thanks,
Amir.
--
To unsubscribe from this list: send the line "unsubscribe linux-unionfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
