xfs
[Top] [All Lists]

[PATCH 08/18] gfs2: use ->invalidatepage() length argument

To: linux-mm@xxxxxxxxx
Subject: [PATCH 08/18] gfs2: use ->invalidatepage() length argument
From: Lukas Czerner <lczerner@xxxxxxxxxx>
Date: Fri, 1 Feb 2013 11:43:34 +0100
Cc: linux-kernel@xxxxxxxxxxxxxxx, linux-fsdevel@xxxxxxxxxxxxxxx, linux-ext4@xxxxxxxxxxxxxxx, xfs@xxxxxxxxxxx, Lukas Czerner <lczerner@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1359715424-32318-1-git-send-email-lczerner@xxxxxxxxxx>
References: <1359715424-32318-1-git-send-email-lczerner@xxxxxxxxxx>
->invalidatepage() aop now accepts range to invalidate so we can make
use of it in gfs2_invalidatepage().

Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
---
 fs/gfs2/aops.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c
index 5bd558c..3cf3dc8 100644
--- a/fs/gfs2/aops.c
+++ b/fs/gfs2/aops.c
@@ -949,24 +949,29 @@ 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);
 }
 
-- 
1.7.7.6

<Prev in Thread] Current Thread [Next in Thread>