On Wed, Oct 25, 2017 at 10:09 PM, Vivek Goyal <vgoyal@xxxxxxxxxx> wrote:
> If an inode has been copied up metadata only, then we need to query the
> number of blocks from lower and fill up the stat->st_blocks.
>
> Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
> ---
> fs/overlayfs/inode.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
> index 1b4b42c..dcc012c 100644
> --- a/fs/overlayfs/inode.c
> +++ b/fs/overlayfs/inode.c
> @@ -140,6 +140,18 @@ int ovl_getattr(const struct path *path, struct kstat *stat,
> if (!is_dir && ovl_test_flag(OVL_INDEX, d_inode(dentry)))
> stat->nlink = dentry->d_inode->i_nlink;
>
> + if (ovl_dentry_upper(dentry) && ovl_dentry_check_upperdata(dentry) &&
> + !ovl_test_flag(OVL_UPPERDATA, d_inode(dentry))) {
> + struct kstat lowerstat;
> +
> + if (WARN_ON(!OVL_TYPE_ORIGIN(type)))
> + goto out;
Unnecessary complicated. OVL_TYPE_ORIGIN(type) already tells you that you
have both an upper and a lower so if you set OVL_UPPERDATA for all objects
that can safely access upper inode data, you will need just:
if (OVL_TYPE_ORIGIN(type) && !ovl_test_flag(OVL_UPPERDATA, d_inode(dentry)))
or test flag first and keep the WARN_ON for OVL_UPPERDATA && !OVL_TYPE_ORIGIN
> + ovl_path_lower(dentry, &realpath);
> + err = vfs_getattr(&realpath, &lowerstat, STATX_BLOCKS, flags);
> + if (err)
> + goto out;
> + stat->blocks = lowerstat.blocks;
> + }
> out:
> revert_creds(old_cred);
>
> --
> 2.5.5
>
--
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
