diff options
| author | Andrea Arcangeli <aarcange@redhat.com> | 2011-06-16 12:56:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-13 05:31:23 +0200 |
| commit | c3ce2d3992b7028a545b5dd9d25f892ef066a62f (patch) | |
| tree | 023b81db7499c8c4ec93a772b3d6115569c7da96 /mm | |
| parent | 0aa6e32c7cb5e80a0e381df2c6beb3e4f971d5f2 (diff) | |
| download | lwn-c3ce2d3992b7028a545b5dd9d25f892ef066a62f.tar.gz lwn-c3ce2d3992b7028a545b5dd9d25f892ef066a62f.zip | |
migrate: don't account swapcache as shmem
commit 99a15e21d96f6857dafab1e5167e5e8183215c9c upstream.
swapcache will reach the below code path in migrate_page_move_mapping,
and swapcache is accounted as NR_FILE_PAGES but it's not accounted as
NR_SHMEM.
Hugh pointed out we must use PageSwapCache instead of comparing
mapping to &swapper_space, to avoid build failure with CONFIG_SWAP=n.
Signed-off-by: Andrea Arcangeli <aarcange@redhat.com>
Acked-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/migrate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/migrate.c b/mm/migrate.c index 880bd592d38e..2cbae1974111 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -261,7 +261,7 @@ static int migrate_page_move_mapping(struct address_space *mapping, */ __dec_zone_page_state(page, NR_FILE_PAGES); __inc_zone_page_state(newpage, NR_FILE_PAGES); - if (PageSwapBacked(page)) { + if (!PageSwapCache(page) && PageSwapBacked(page)) { __dec_zone_page_state(page, NR_SHMEM); __inc_zone_page_state(newpage, NR_SHMEM); } |