aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2018-06-19 12:30:45 +0100
committerMark Brown <broonie@kernel.org>2018-06-19 12:30:45 +0100
commit68921fb4be8e567565aa704350e858db1c470eff (patch)
tree69a7de3be302f128b6f6529e4e16635781abfd80 /include
parentf7fb073463b2b4ea4d7b1848aaae04c6722354d3 (diff)
parentd9227958dc0e56976eaf452a213aee8415a9eb60 (diff)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-18.06-android
Diffstat (limited to 'include')
-rw-r--r--include/linux/fs.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/fs.h b/include/linux/fs.h
index cfb6ff61df30..b7ce5f44d8c2 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -950,9 +950,9 @@ static inline struct file *get_file(struct file *f)
/* Page cache limit. The filesystems should put that into their s_maxbytes
limits, otherwise bad things can happen in VM. */
#if BITS_PER_LONG==32
-#define MAX_LFS_FILESIZE (((loff_t)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1)
+#define MAX_LFS_FILESIZE ((loff_t)ULONG_MAX << PAGE_SHIFT)
#elif BITS_PER_LONG==64
-#define MAX_LFS_FILESIZE ((loff_t)0x7fffffffffffffffLL)
+#define MAX_LFS_FILESIZE ((loff_t)LLONG_MAX)
#endif
#define FL_POSIX 1