1 files changed, 12 insertions, 5 deletions

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 0bad69ed6336..ee48ad37d9c0 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -110,7 +110,7 @@ static int gfs2_writepage_common(struct page *page,
         /* Is the page fully outside i_size? (truncate in progress) */
         offset = i_size & (PAGE_CACHE_SIZE-1);
         if (page->index > end_index || (page->index == end_index && !offset)) {
-                page->mapping->a_ops->invalidatepage(page, 0);
+                page->mapping->a_ops->invalidatepage(page, 0, PAGE_CACHE_SIZE);
                 goto out;
         }
         return 1;
@@ -299,7 +299,8 @@ static int gfs2_write_jdata_pagevec(struct address_space *mapping,
 
                 /* Is the page fully outside i_size? (truncate in progress) */
                 if (page->index > end_index || (page->index == end_index && !offset)) {
-                        page->mapping->a_ops->invalidatepage(page, 0);
+                        page->mapping->a_ops->invalidatepage(page, 0,
+                                                             PAGE_CACHE_SIZE);
                         unlock_page(page);
                         continue;
                 }
@@ -943,27 +944,33 @@ static void gfs2_discard(struct gfs2_sbd *sdp, struct buffer_head *bh)
         unlock_buffer(bh);
 }
 
-static void gfs2_invalidatepage(struct page *page, unsigned long offset)
+static void gfs2_invalidatepage(struct page *page, unsigned int offset,
+                                unsigned int length)
 {
         struct gfs2_sbd *sdp = GFS2_SB(page->mapping->host);
+        unsigned int stop = offset + length;
+        int partial_page = (offset || length < PAGE_CACHE_SIZE);
         struct buffer_head *bh, *head;
         unsigned long pos = 0;
 
         BUG_ON(!PageLocked(page));
-        if (offset == 0)
+        if (!partial_page)
                 ClearPageChecked(page);
         if (!page_has_buffers(page))
                 goto out;
 
         bh = head = page_buffers(page);
         do {
+                if (pos + bh->b_size > stop)
+                        return;
+
                 if (offset <= pos)
                         gfs2_discard(sdp, bh);
                 pos += bh->b_size;
                 bh = bh->b_this_page;
         } while (bh != head);
 out:
-        if (offset == 0)
+        if (!partial_page)
                 try_to_release_page(page, 0);
 }