Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

[deliverable/linux.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index 8debe7b337697fbde663c1fb1b5e3eaed3cb5567..62baa0387d6e03869e726b89ffaddccce4fc090c 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -925,6 +925,8 @@ EXPORT_SYMBOL(generic_file_fsync);
 int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)
 {
        u64 last_fs_block = num_blocks - 1;
+       u64 last_fs_page =
+               last_fs_block >> (PAGE_CACHE_SHIFT - blocksize_bits);
 
        if (unlikely(num_blocks == 0))
                return 0;
@@ -932,10 +934,8 @@ int generic_check_addressable(unsigned blocksize_bits, u64 num_blocks)
        if ((blocksize_bits < 9) || (blocksize_bits > PAGE_CACHE_SHIFT))
                return -EINVAL;
 
-       if ((last_fs_block >
-            (sector_t)(~0ULL) >> (blocksize_bits - 9)) ||
-           (last_fs_block >
-            (pgoff_t)(~0ULL) >> (PAGE_CACHE_SHIFT - blocksize_bits))) {
+       if ((last_fs_block > (sector_t)(~0ULL) >> (blocksize_bits - 9)) ||
+           (last_fs_page > (pgoff_t)(~0ULL))) {
                return -EFBIG;
        }
        return 0;