diff options
author | Mark Brown <broonie@kernel.org> | 2016-03-21 17:08:07 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-03-21 17:08:07 +0000 |
commit | c35983d487b56c023b70d6727ad002b19f935827 (patch) | |
tree | 06b6b8ad506084442a3a0f46dbde6789fd78e358 /fs/overlayfs/super.c | |
parent | bb19a07897898f424c62b4456ba100fd38cfa679 (diff) | |
parent | 412f52dbad2603a77f26f0337ae03800e39504f0 (diff) |
Merge tag 'v4.4.4-rt11' of git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-rt-devel into linux-linaro-lsk-v4.4-rt
v4.4.4-rt11
Diffstat (limited to 'fs/overlayfs/super.c')
-rw-r--r-- | fs/overlayfs/super.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c index e38ee0fed24a..f42c9407fbad 100644 --- a/fs/overlayfs/super.c +++ b/fs/overlayfs/super.c @@ -9,6 +9,7 @@ #include <linux/fs.h> #include <linux/namei.h> +#include <linux/pagemap.h> #include <linux/xattr.h> #include <linux/security.h> #include <linux/mount.h> @@ -910,6 +911,7 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) } sb->s_stack_depth = 0; + sb->s_maxbytes = MAX_LFS_FILESIZE; if (ufs->config.upperdir) { if (!ufs->config.workdir) { pr_err("overlayfs: missing 'workdir'\n"); @@ -1053,6 +1055,9 @@ static int ovl_fill_super(struct super_block *sb, void *data, int silent) root_dentry->d_fsdata = oe; + ovl_copyattr(ovl_dentry_real(root_dentry)->d_inode, + root_dentry->d_inode); + sb->s_magic = OVERLAYFS_SUPER_MAGIC; sb->s_op = &ovl_super_operations; sb->s_root = root_dentry; |