]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
mm: remove incorrect swap_count() from try_to_unuse()
authorBo Liu <bo-liu@hotmail.com>
Mon, 2 Nov 2009 16:50:33 +0000 (16:50 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 10 Nov 2009 00:22:33 +0000 (16:22 -0800)
commit82a90819b2992515f794b032ee7d75fba4771e33
tree3ed29968b7ef393d135ac435116fa3b71c73aafc
parentcd4ad4b9dda686bce57f939671cc066a554b7f92
mm: remove incorrect swap_count() from try_to_unuse()

commit 32c5fc10e79a7053ac5728b01a0bff55cbcb9d49 upstream.

In try_to_unuse(), swcount is a local copy of *swap_map, including the
SWAP_HAS_CACHE bit; but a wrong comparison against swap_count(*swap_map),
which masks off the SWAP_HAS_CACHE bit, succeeded where it should fail.

That had the effect of resetting the mm from which to start searching
for the next swap page, to an irrelevant mm instead of to an mm in which
this swap page had been found: which may increase search time by ~20%.
But we're used to swapoff being slow, so never noticed the slowdown.

Remove that one spurious use of swap_count(): Bo Liu thought it merely
redundant, Hugh rewrote the description since it was measurably wrong.

Signed-off-by: Bo Liu <bo-liu@hotmail.com>
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
mm/swapfile.c