From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932785Ab0ECPWe (ORCPT ); Mon, 3 May 2010 11:22:34 -0400 Received: from mail-pz0-f204.google.com ([209.85.222.204]:45490 "EHLO mail-pz0-f204.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932751Ab0ECPWd (ORCPT ); Mon, 3 May 2010 11:22:33 -0400 From: Nitin Gupta To: Andrew Morton Cc: KOSAKI Motohiro , Christoph Hellwig , Hugh Dickins , Rik van Riel , Andi Kleen , linux-kernel , linux-mm Subject: [PATCH] Cleanup migrate case in try_to_unmap_one Date: Mon, 3 May 2010 20:49:17 +0530 Message-Id: <1272899957-11604-1-git-send-email-ngupta@vflare.org> X-Mailer: git-send-email 1.6.6.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Remove duplicate handling of TTU_MIGRATE case for anonymous and filesystem pages. Signed-off-by: Nitin Gupta --- mm/rmap.c | 17 ++++------------- 1 files changed, 4 insertions(+), 13 deletions(-) diff --git a/mm/rmap.c b/mm/rmap.c index 07fc947..8ccfe4a 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -946,6 +946,10 @@ int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, dec_mm_counter(mm, MM_FILEPAGES); set_pte_at(mm, address, pte, swp_entry_to_pte(make_hwpoison_entry(page))); + } else if (PAGE_MIGRATION && (TTU_ACTION(flags) == TTU_MIGRATION)) { + swp_entry_t entry; + entry = make_migration_entry(page, pte_write(pteval)); + set_pte_at(mm, address, pte, swp_entry_to_pte(entry)); } else if (PageAnon(page)) { swp_entry_t entry = { .val = page_private(page) }; @@ -967,22 +971,9 @@ int try_to_unmap_one(struct page *page, struct vm_area_struct *vma, } dec_mm_counter(mm, MM_ANONPAGES); inc_mm_counter(mm, MM_SWAPENTS); - } else if (PAGE_MIGRATION) { - /* - * Store the pfn of the page in a special migration - * pte. do_swap_page() will wait until the migration - * pte is removed and then restart fault handling. - */ - BUG_ON(TTU_ACTION(flags) != TTU_MIGRATION); - entry = make_migration_entry(page, pte_write(pteval)); } set_pte_at(mm, address, pte, swp_entry_to_pte(entry)); BUG_ON(pte_file(*pte)); - } else if (PAGE_MIGRATION && (TTU_ACTION(flags) == TTU_MIGRATION)) { - /* Establish migration entry for a file page */ - swp_entry_t entry; - entry = make_migration_entry(page, pte_write(pteval)); - set_pte_at(mm, address, pte, swp_entry_to_pte(entry)); } else dec_mm_counter(mm, MM_FILEPAGES); -- 1.6.6.1