Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christoph Lameter 2006-06-23 02:03:27 -07:00 committed by Linus Torvalds
parent 111ebb6e6f
commit 7352349a19
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mm/rmap.c
View file

@ -578,7 +578,7 @@ void page_remove_rmap(struct page *page)
* repeatedly from either try_to_unmap_anon or try_to_unmap_file. * 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, 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; struct mm_struct *mm = vma->vm_mm;
unsigned long address; 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) || if ((vma->vm_flags & VM_LOCKED) ||
(ptep_clear_flush_young(vma, address, pte) (ptep_clear_flush_young(vma, address, pte)
&& !ignore_refs)) { && !migration)) {
ret = SWAP_FAIL; ret = SWAP_FAIL;
goto out_unmap; goto out_unmap;
} }
@ -736,7 +736,7 @@ static void try_to_unmap_cluster(unsigned long cursor,
pte_unmap_unlock(pte - 1, ptl); 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 anon_vma *anon_vma;
struct vm_area_struct *vma; struct vm_area_struct *vma;
@ -747,7 +747,7 @@ static int try_to_unmap_anon(struct page *page, int ignore_refs)
return ret; return ret;
list_for_each_entry(vma, &anon_vma->head, anon_vma_node) { 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)) if (ret == SWAP_FAIL || !page_mapped(page))
break; 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. * 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; struct address_space *mapping = page->mapping;
pgoff_t pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); 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); spin_lock(&mapping->i_mmap_lock);
vma_prio_tree_foreach(vma, &iter, &mapping->i_mmap, pgoff, pgoff) { 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)) if (ret == SWAP_FAIL || !page_mapped(page))
goto out; 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_AGAIN - we missed a mapping, try again later
* SWAP_FAIL - the page is unswappable * 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; int ret;
BUG_ON(!PageLocked(page)); BUG_ON(!PageLocked(page));
if (PageAnon(page)) if (PageAnon(page))
ret = try_to_unmap_anon(page, ignore_refs); ret = try_to_unmap_anon(page, migration);
else else
ret = try_to_unmap_file(page, ignore_refs); ret = try_to_unmap_file(page, migration);
if (!page_mapped(page)) if (!page_mapped(page))
ret = SWAP_SUCCESS; ret = SWAP_SUCCESS;