The patch titled page migration: Remove useless mapping checks has been removed from the -mm tree. Its filename is swapless-page-migration-modify-core-logic-remove-useless-mapping-checks.patch This patch was probably dropped from -mm because it has now been merged into a subsystem tree or into Linus's tree, or because it was folded into its parent patch in the -mm tree. ------------------------------------------------------ Subject: page migration: Remove useless mapping checks From: Christoph Lameter <clameter@xxxxxxx> Page migration still checked for mapping being NULL after taking the tree_lock. However the mapping never changes for a locked page. Remove two more checks for mapping being NULL. Signed-off-by: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- mm/migrate.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff -puN mm/migrate.c~swapless-page-migration-modify-core-logic-remove-useless-mapping-checks mm/migrate.c --- devel/mm/migrate.c~swapless-page-migration-modify-core-logic-remove-useless-mapping-checks 2006-05-11 00:03:10.000000000 -0700 +++ devel-akpm/mm/migrate.c 2006-05-11 00:03:10.000000000 -0700 @@ -256,7 +256,7 @@ static int migrate_page_move_mapping(str if (!mapping) { /* Anonymous page */ - if (page_count(page) != 1 || !page->mapping) + if (page_count(page) != 1) return -EAGAIN; return 0; } @@ -267,8 +267,7 @@ static int migrate_page_move_mapping(str &mapping->page_tree, page_index(page)); - if (!page_mapping(page) || - page_count(page) != 2 + !!PagePrivate(page) || + if (page_count(page) != 2 + !!PagePrivate(page) || *radix_pointer != page) { write_unlock_irq(&mapping->tree_lock); return -EAGAIN; _ Patches currently in -mm which might be from clameter@xxxxxxx are page-migration-make-do_swap_page-redo-the-fault.patch slab-extract-cache_free_alien-from-__cache_free.patch migration-remove-unnecessary-pageswapcache-checks.patch page-migration-cleanup-rename-ignrefs-to-migration.patch page-migration-cleanup-group-functions.patch page-migration-cleanup-remove-useless-definitions.patch page-migration-cleanup-drop-nr_refs-in-remove_references.patch page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch page-migration-cleanup-pass-mapping-to-migration-functions.patch page-migration-cleanup-move-fallback-handling-into-special-function.patch swapless-pm-add-r-w-migration-entries.patch swapless-pm-add-r-w-migration-entries-fix-2.patch swapless-page-migration-rip-out-swap-based-logic.patch swapless-page-migration-modify-core-logic.patch more-page-migration-do-not-inc-dec-rss-counters.patch more-page-migration-use-migration-entries-for-file-pages.patch page-migration-update-documentation.patch mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch page-migration-simplify-migrate_pages.patch page-migration-simplify-migrate_pages-tweaks.patch page-migration-handle-freeing-of-pages-in-migrate_pages.patch page-migration-use-allocator-function-for-migrate_pages.patch page-migration-support-moving-of-individual-pages.patch page-migration-detailed-status-for-moving-of-individual-pages.patch page-migration-support-moving-of-individual-pages-fixes.patch page-migration-support-moving-of-individual-pages-x86_64-support.patch page-migration-support-moving-of-individual-pages-x86-support.patch page-migration-support-a-vma-migration-function.patch allow-migration-of-mlocked-pages.patch cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html