2007-05-09 12:03:22

by David Howells

Subject: [PATCH] Fix a bad bug in read_cache_page_async()

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.

Signed-off-by: David Howells <[email protected]>
---

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

2007-05-09 12:07:41

by Glauber Costa

Subject: Re: [PATCH] Fix a bad bug in read_cache_page_async()

> page = __read_cache_page(mapping, index, filler, data);
> if (IS_ERR(page))
> - goto out;
> + goto error;
any reason for not simply returning page here?


> page = ERR_PTR(err);
> + goto error;
same


--
Glauber de Oliveira Costa.
"Free as in Freedom"

"The less confident you are, the more serious you have to act."

2007-05-09 12:19:46

by Nick Piggin

Subject: Re: [PATCH] Fix a bad bug in read_cache_page_async()

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 <[email protected]>
> ---
>
> 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);

2007-05-09 12:23:20

by David Howells

Subject: Re: [PATCH] Fix a bad bug in read_cache_page_async()

Glauber de Oliveira Costa <[email protected]> wrote:

> any reason for not simply returning page here?

Not particularly.

David