2005-05-09 12:29:42

by Björn Steinbrink

Subject: [patch] mm: fix rss counter being incremented when unmapping

This patch fixes a bug introduced by the "mm counter operations through
macros" patch, which replaced a decrement operation in with an increment
macro in try_to_unmap_one().

Signed-off-by: Bj?rn Steinbrink <[email protected]>

diff -NurpP --minimal linux-2.6.12-rc4/mm/rmap.c linux-2.6.12-rc4-fixed/mm/rmap.c
--- linux-2.6.12-rc4/mm/rmap.c 2005-05-08 17:53:49.000000000 +0200
+++ linux-2.6.12-rc4-fixed/mm/rmap.c 2005-05-09 13:38:03.000000000 +0200
@@ -586,7 +586,7 @@ static int try_to_unmap_one(struct page
dec_mm_counter(mm, anon_rss);
}

- inc_mm_counter(mm, rss);
+ dec_mm_counter(mm, rss);
page_remove_rmap(page);
page_cache_release(page);

2005-05-10 12:10:40

by Rik van Riel

Subject: Re: [patch] mm: fix rss counter being incremented when unmapping

On Mon, 9 May 2005, Bj?rn Steinbrink wrote:

> This patch fixes a bug introduced by the "mm counter operations through
> macros" patch, which replaced a decrement operation in with an increment
> macro in try_to_unmap_one().

Oops. Patch looks good to me.
Andrew, if you see this could you pick up the
patch from the head of this thread? ;)

--
"Debugging is twice as hard as writing the code in the first place.
Therefore, if you write the code as cleverly as possible, you are,
by definition, not smart enough to debug it." - Brian W. Kernighan

2005-05-10 18:16:19

by Christoph Lameter

Subject: Re: [patch] mm: fix rss counter being incremented when unmapping

Correct. Thanks for catching that. My latest rss patch also has that.

On Mon, 9 May 2005, Bj?rn Steinbrink wrote:

> This patch fixes a bug introduced by the "mm counter operations through
> macros" patch, which replaced a decrement operation in with an increment
> macro in try_to_unmap_one().
>
> Signed-off-by: Bj?rn Steinbrink <[email protected]>
>
> diff -NurpP --minimal linux-2.6.12-rc4/mm/rmap.c linux-2.6.12-rc4-fixed/mm/rmap.c
> --- linux-2.6.12-rc4/mm/rmap.c 2005-05-08 17:53:49.000000000 +0200
> +++ linux-2.6.12-rc4-fixed/mm/rmap.c 2005-05-09 13:38:03.000000000 +0200
> @@ -586,7 +586,7 @@ static int try_to_unmap_one(struct page
> dec_mm_counter(mm, anon_rss);
> }
>
> - inc_mm_counter(mm, rss);
> + dec_mm_counter(mm, rss);
> page_remove_rmap(page);
> page_cache_release(page);
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to [email protected]. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
>