Date: Wed, 9 May 2007 14:19:37 +0200
From: Nick Piggin <npiggin@suse.de>
To: David Howells <dhowells@redhat.com>
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
       linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Fix a bad bug in read_cache_page_async()
Message-ID: <20070509121937.GA24026@wotan.suse.de>
References: <20070509120201.6771.92968.stgit@warthog.cambridge.redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20070509120201.6771.92968.stgit@warthog.cambridge.redhat.com>
User-Agent: Mutt/1.5.9i
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1412
Lines: 52

On Wed, May 09, 2007 at 01:02:01PM +0100, David Howells wrote:
> Fix a bad bug in read_cache_page_async() introduced in commit:
> 
> 	6fe6900e1e5b6fa9e5c59aa5061f244fe3f467e2
> 
> This adds:
> 
> 	mark_page_accessed(page)
> 
> into the error handling path in read_cache_page_async().  In such a case,
> 'page' holds the error code.

Obvious thinko. Thanks, ack.

> 
> Signed-off-by: David Howells <dhowells@redhat.com>
> ---
> 
>  mm/filemap.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/mm/filemap.c b/mm/filemap.c
> index 9e56fd1..10d4fcf 100644
> --- a/mm/filemap.c
> +++ b/mm/filemap.c
> @@ -1784,7 +1784,7 @@ struct page *read_cache_page_async(struct address_space *mapping,
>  retry:
>  	page = __read_cache_page(mapping, index, filler, data);
>  	if (IS_ERR(page))
> -		goto out;
> +		goto error;
>  	mark_page_accessed(page);
>  	if (PageUptodate(page))
>  		goto out;
> @@ -1803,9 +1803,11 @@ retry:
>  	if (err < 0) {
>  		page_cache_release(page);
>  		page = ERR_PTR(err);
> +		goto error;
>  	}
> - out:
> +out:
>  	mark_page_accessed(page);
> +error:
>  	return page;
>  }
>  EXPORT_SYMBOL(read_cache_page_async);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/