Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e8c7d0f authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

page migration: fix NR_FILE_PAGES accounting 



NR_FILE_PAGES must be accounted for depending on the zone that the page
belongs to.  If we replace the page in the radix tree then we may have to
shift the count to another zone.

Suggested-by: default avatarEthan Solomita <solo@google.com>
Eventually-typed-in-by: default avatarChristoph Lameter <clameter@sgi.com>
Cc: Martin Bligh <mbligh@mbligh.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 10ccaf4b

mm/migrate.c

+14 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static int migrate_page_move_mapping(struct address_space *mapping, 
	void **pslot;



	if (!mapping) {

		/* Anonymous page */

		/* Anonymous page without mapping */

		if (page_count(page) != 1)

			return -EAGAIN;

		return 0;
@@ -333,6 +333,19 @@ static int migrate_page_move_mapping(struct address_space *mapping, 
	 */

	__put_page(page);



	/*

	 * If moved to a different zone then also account

	 * the page for that zone. Other VM counters will be

	 * taken care of when we establish references to the

	 * new page and drop references to the old page.

	 *

	 * Note that anonymous pages are accounted for

	 * via NR_FILE_PAGES and NR_ANON_PAGES if they

	 * are mapped to swap space.

	 */

	__dec_zone_page_state(page, NR_FILE_PAGES);

	__inc_zone_page_state(newpage, NR_FILE_PAGES);



	write_unlock_irq(&mapping->tree_lock);



	return 0;