If file is metacopy only, it is possible that lower is encrypted while other is not. In that case, report file as encrypted (despite the fact that only data is encrypted while metadata is not). Similarly if lower is compressed, report that in stat for a metacopy only file. Reviewed-by: Amir Goldstein <amir73il@xxxxxxxxx> Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx> --- fs/overlayfs/inode.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c index da5cc2c6c413..5fbfb670963d 100644 --- a/fs/overlayfs/inode.c +++ b/fs/overlayfs/inode.c @@ -66,6 +66,23 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr) return err; } +#define OVL_STATX_ATTR_MASK (STATX_ATTR_ENCRYPTED | STATX_ATTR_COMPRESSED) + +static void ovl_stat_fix_attributes(struct kstat *ustat, struct kstat *lstat) { + unsigned int attr_mask, attr; + + attr_mask = lstat->attributes_mask & OVL_STATX_ATTR_MASK; + if (!attr_mask) + return; + + attr = lstat->attributes & attr_mask; + if (!attr) + return; + + ustat->attributes_mask |= attr_mask; + ustat->attributes |= attr; +} + int ovl_getattr(const struct path *path, struct kstat *stat, u32 request_mask, unsigned int flags) { @@ -123,8 +140,10 @@ int ovl_getattr(const struct path *path, struct kstat *stat, else stat->dev = ovl_get_pseudo_dev(dentry); - if (metacopy) + if (metacopy) { stat->blocks = lowerstat.blocks; + ovl_stat_fix_attributes(stat, &lowerstat); + } } if (samefs) { /* -- 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