From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Whitehouse Date: Tue, 05 Feb 2013 09:47:39 +0000 Subject: [Cluster-devel] [PATCH v2 08/18] gfs2: use ->invalidatepage() length argument In-Reply-To: <1360055531-26309-9-git-send-email-lczerner@redhat.com> References: <1360055531-26309-1-git-send-email-lczerner@redhat.com> <1360055531-26309-9-git-send-email-lczerner@redhat.com> Message-ID: <1360057659.2717.14.camel@menhir> List-Id: To: cluster-devel.redhat.com MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Hi, Acked-by: Steven Whitehouse Steve. On Tue, 2013-02-05 at 10:12 +0100, Lukas Czerner wrote: > ->invalidatepage() aop now accepts range to invalidate so we can make > use of it in gfs2_invalidatepage(). > > Signed-off-by: Lukas Czerner > Cc: cluster-devel at redhat.com > --- > 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); > } >