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

[Bob Peterson]

Hi,

----- Original Message -----
| ->invalidatepage() aop now accepts range to invalidate so we can make
| use of it in gfs2_invalidatepage().
| 
| Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
| Cc: cluster-devel@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 37093ba..ea920bf 100644
| --- a/fs/gfs2/aops.c
| +++ b/fs/gfs2/aops.c
| @@ -947,24 +947,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;
| +

I always regret it when I review something this early in the morning,
or post before the caffeine has taken full effect. But...
Shouldn't the statement above be (1) ">= stop" and (2) goto out;?

|  		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);
|  }

Regards,

Bob Peterson
Red Hat File Systems
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/