Re: 2.4.17rc2aa1

[Linus Torvalds]

On Thu, 20 Dec 2001, Andrea Arcangeli wrote:
> Anyways here the fix (untested as usual :)
>
> --- 2.4.17rc2aa1/fs/buffer.c.~1~	Wed Dec 19 03:43:24 2001
> +++ 2.4.17rc2aa1/fs/buffer.c	Thu Dec 20 19:02:02 2001
> @@ -2337,7 +2337,7 @@
>  	struct buffer_head *bh;
>
>  	page = find_or_create_page(bdev->bd_inode->i_mapping, index, GFP_NOFS);
> -	if (IS_ERR(page))
> +	if (!page)

Isn't this in 2.4.17 already? Marcelo, please check.

> +++ 2.4.17rc2aa1/mm/filemap.c	Thu Dec 20 19:01:53 2001
> @@ -942,7 +942,7 @@
>  	spin_unlock(&pagecache_lock);
>  	if (!page) {
>  		struct page *newpage = alloc_page(gfp_mask);
> -		page = ERR_PTR(-ENOMEM);
> +		page = NULL;

Don't be silly, just remove the line (page _is_ NULL already, we just
checked).

		Linus