2 files changed, 8 insertions, 3 deletions

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index cdcfe95cbfb4..2f20a49ba34e 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -147,6 +147,12 @@ static int do_readpage(struct page *page)
                                 err = ret;
                                 if (err != -ENOENT)
                                         break;
+                        } else if (block + 1 == beyond) {
+                                int dlen = le32_to_cpu(dn->size);
+                                int ilen = i_size & (UBIFS_BLOCK_SIZE - 1);
+
+                                if (ilen && ilen < dlen)
+                                        memset(addr + ilen, 0, dlen - ilen);
                         }
                 }
                 if (++i >= UBIFS_BLOCKS_PER_PAGE)
@@ -601,7 +607,7 @@ static int populate_page(struct ubifs_info *c, struct page *page,
 
         addr = zaddr = kmap(page);
 
-        end_index = (i_size + PAGE_CACHE_SIZE - 1) >> PAGE_CACHE_SHIFT;
+        end_index = (i_size - 1) >> PAGE_CACHE_SHIFT;
         if (!i_size || page->index > end_index) {
                 memset(addr, 0, PAGE_CACHE_SIZE);
                 goto out_hole;
@@ -649,7 +655,7 @@ static int populate_page(struct ubifs_info *c, struct page *page,
         if (end_index == page->index) {
                 int len = i_size & (PAGE_CACHE_SIZE - 1);
 
-                if (len < read)
+                if (len && len < read)
                         memset(zaddr + len, 0, read - len);
         }
 
diff --git a/fs/ubifs/ubifs-media.h b/fs/ubifs/ubifs-media.h
index a9ecbd9af20d..0b378042a3a2 100644
--- a/fs/ubifs/ubifs-media.h
+++ b/fs/ubifs/ubifs-media.h
@@ -75,7 +75,6 @@
  */
 #define UBIFS_BLOCK_SIZE  4096
 #define UBIFS_BLOCK_SHIFT 12
-#define UBIFS_BLOCK_MASK  0x00000FFF
 
 /* UBIFS padding byte pattern (must not be first or last byte of node magic) */
 #define UBIFS_PADDING_BYTE 0xCE