2015-12-10 15:10:48

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] overlayfs: include linux/pagemap.h for PAGE_CACHE_SIZE

The overlayfs has started enforcing a maximum file size, but is missing
the header file that defines the PAGE_CACHE_SIZE constant in some
configurations.

fs/overlayfs/super.c: In function 'ovl_fill_super':
fs/overlayfs/super.c:939:29: error: 'PAGE_CACHE_SIZE' undeclared (first use in this function)

Signed-off-by: Arnd Bergmann <[email protected]>
Fixes: 7b1746cac878 ("ovl: setattr: check permissions before copy-up")
Cc: <[email protected]>
---
The patch that introduced this was marked for stable, so I'm marking this
the same way.

diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
index ea94e50a3473..a4cbdf9824c7 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>


2015-12-10 15:26:59

by Miklos Szeredi

[permalink] [raw]
Subject: Re: [PATCH] overlayfs: include linux/pagemap.h for PAGE_CACHE_SIZE

On Thu, Dec 10, 2015 at 4:10 PM, Arnd Bergmann <[email protected]> wrote:
> The overlayfs has started enforcing a maximum file size, but is missing
> the header file that defines the PAGE_CACHE_SIZE constant in some
> configurations.

Hmm, it uses MAX_LFS_FILESIZE. MAX_LFS_FILESIZE is defined in
<linux/fs.h>, which doesn't include <linux/pagemap.h>.

<linux/pagemap.h> includes <linux/fs.h> however. So shouldn't
MAX_LFS_FILESIZE be defined in <linux/pagemap.h> instead?

Thanks,
Miklos


>
> fs/overlayfs/super.c: In function 'ovl_fill_super':
> fs/overlayfs/super.c:939:29: error: 'PAGE_CACHE_SIZE' undeclared (first use in this function)
>
> Signed-off-by: Arnd Bergmann <[email protected]>
> Fixes: 7b1746cac878 ("ovl: setattr: check permissions before copy-up")
> Cc: <[email protected]>
> ---
> The patch that introduced this was marked for stable, so I'm marking this
> the same way.
>
> diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
> index ea94e50a3473..a4cbdf9824c7 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>
>