Re: [PATCH v3 09/18] reiserfs: use ->invalidatepage() lengthargument

[Jan Kara]

On Tue 09-04-13 11:14:18, Lukas Czerner wrote:
> ->invalidatepage() aop now accepts range to invalidate so we can make
> use of it in reiserfs_invalidatepage()
  Hum, reiserfs is probably never going to support punch hole. So shouldn't
we rather WARN and return without doing anything if stop !=
PAGE_CACHE_SIZE?

								Honza
> 
> Signed-off-by: Lukas Czerner <lczerner@xxxxxxxxxx>
> Cc: reiserfs-devel@xxxxxxxxxxxxxxx
> ---
>  fs/reiserfs/inode.c |    9 +++++++--
>  1 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
> index 808e02e..e963164 100644
> --- a/fs/reiserfs/inode.c
> +++ b/fs/reiserfs/inode.c
> @@ -2975,11 +2975,13 @@ static void reiserfs_invalidatepage(struct page *page, unsigned int offset,
>  	struct buffer_head *head, *bh, *next;
>  	struct inode *inode = page->mapping->host;
>  	unsigned int curr_off = 0;
> +	unsigned int stop = offset + length;
> +	int partial_page = (offset || length < PAGE_CACHE_SIZE);
>  	int ret = 1;
>  
>  	BUG_ON(!PageLocked(page));
>  
> -	if (offset == 0)
> +	if (!partial_page)
>  		ClearPageChecked(page);
>  
>  	if (!page_has_buffers(page))
> @@ -2991,6 +2993,9 @@ static void reiserfs_invalidatepage(struct page *page, unsigned int offset,
>  		unsigned int next_off = curr_off + bh->b_size;
>  		next = bh->b_this_page;
>  
> +		if (next_off > stop)
> +			goto out;
> +
>  		/*
>  		 * is this block fully invalidated?
>  		 */
> @@ -3009,7 +3014,7 @@ static void reiserfs_invalidatepage(struct page *page, unsigned int offset,
>  	 * The get_block cached value has been unconditionally invalidated,
>  	 * so real IO is not possible anymore.
>  	 */
> -	if (!offset && ret) {
> +	if (!partial_page && ret) {
>  		ret = try_to_release_page(page, 0);
>  		/* maybe should BUG_ON(!ret); - neilb */
>  	}
> -- 
> 1.7.7.6
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
-- 
Jan Kara <jack@xxxxxxx>
SUSE Labs, CR
--
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/