On Tue, Mar 6, 2018 at 10:54 PM, Vivek Goyal <vgoyal@xxxxxxxxxx> wrote:
> With the addition of an origin chain for regular files, it is possible
> that we don't have an upperdentry and oe->numlower > 1 for non-dir. So
> mark a path __OVL_TYPE_MERGE only if it is a directory.
>
Okay, but what's wrong with marking a non-dir as TYPE MERGE?
It is, after all, a sort of merged entry.
> Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
> ---
> fs/overlayfs/util.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/overlayfs/util.c b/fs/overlayfs/util.c
> index 7929cc872df6..19b936b0a551 100644
> --- a/fs/overlayfs/util.c
> +++ b/fs/overlayfs/util.c
> @@ -122,7 +122,7 @@ enum ovl_path_type ovl_path_type(struct dentry *dentry)
> type |= __OVL_PATH_MERGE;
> }
> } else {
> - if (oe->numlower > 1)
> + if (oe->numlower > 1 && d_is_dir(dentry))
> type |= __OVL_PATH_MERGE;
> }
> return type;
> --
> 2.13.6
>
--
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
