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

Commit 7352349a authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] page migration cleanup: rename "ignrefs" to "migration" 



migrate is a better name since it is only used by page migration.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 111ebb6e

mm/rmap.c

+9 −9
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ void page_remove_rmap(struct page *page) 
 * repeatedly from either try_to_unmap_anon or try_to_unmap_file.

 */

static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma,

				int ignore_refs)

				int migration)

{

	struct mm_struct *mm = vma->vm_mm;

	unsigned long address;
@@ -602,7 +602,7 @@ static int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, 
	 */

	if ((vma->vm_flags & VM_LOCKED) ||

			(ptep_clear_flush_young(vma, address, pte)

				&& !ignore_refs)) {

				&& !migration)) {

		ret = SWAP_FAIL;

		goto out_unmap;

	}
@@ -736,7 +736,7 @@ static void try_to_unmap_cluster(unsigned long cursor, 
	pte_unmap_unlock(pte - 1, ptl);

}



static int try_to_unmap_anon(struct page *page, int ignore_refs)

static int try_to_unmap_anon(struct page *page, int migration)

{

	struct anon_vma *anon_vma;

	struct vm_area_struct *vma;
@@ -747,7 +747,7 @@ static int try_to_unmap_anon(struct page *page, int ignore_refs) 
		return ret;



	list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {

		ret = try_to_unmap_one(page, vma, ignore_refs);

		ret = try_to_unmap_one(page, vma, migration);

		if (ret == SWAP_FAIL || !page_mapped(page))

			break;

	}
@@ -764,7 +764,7 @@ static int try_to_unmap_anon(struct page *page, int ignore_refs) 
 *

 * This function is only called from try_to_unmap for object-based pages.

 */

static int try_to_unmap_file(struct page *page, int ignore_refs)

static int try_to_unmap_file(struct page *page, int migration)

{

	struct address_space *mapping = page->mapping;

	pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT);
@@ -778,7 +778,7 @@ static int try_to_unmap_file(struct page *page, int ignore_refs) 


	spin_lock(&mapping->i_mmap_lock);

	vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) {

		ret = try_to_unmap_one(page, vma, ignore_refs);

		ret = try_to_unmap_one(page, vma, migration);

		if (ret == SWAP_FAIL || !page_mapped(page))

			goto out;

	}
@@ -863,16 +863,16 @@ static int try_to_unmap_file(struct page *page, int ignore_refs) 
 * SWAP_AGAIN	- we missed a mapping, try again later

 * SWAP_FAIL	- the page is unswappable

 */

int try_to_unmap(struct page *page, int ignore_refs)

int try_to_unmap(struct page *page, int migration)

{

	int ret;



	BUG_ON(!PageLocked(page));



	if (PageAnon(page))

		ret = try_to_unmap_anon(page, ignore_refs);

		ret = try_to_unmap_anon(page, migration);

	else

		ret = try_to_unmap_file(page, ignore_refs);

		ret = try_to_unmap_file(page, migration);



	if (!page_mapped(page))

		ret = SWAP_SUCCESS;