Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752120AbYFRHyu (ORCPT ); Wed, 18 Jun 2008 03:54:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750926AbYFRHym (ORCPT ); Wed, 18 Jun 2008 03:54:42 -0400 Received: from fgwmail7.fujitsu.co.jp ([192.51.44.37]:55309 "EHLO fgwmail7.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750858AbYFRHyl (ORCPT ); Wed, 18 Jun 2008 03:54:41 -0400 Date: Wed, 18 Jun 2008 16:54:01 +0900 From: KOSAKI Motohiro To: Daisuke Nishimura , Andrew Morton Subject: [PATCH][-mm] remove redundant page->mapping check Cc: kosaki.motohiro@jp.fujitsu.com, Rik van Riel , Lee Schermerhorn , Nick Piggin , linux-mm@kvack.org, linux-kernel@vger.kernel.org, kernel-testers@vger.kernel.org In-Reply-To: <20080618134128.828156bc.nishimura@mxp.nes.nec.co.jp> References: <20080618105400.b9f1b664.nishimura@mxp.nes.nec.co.jp> <20080618134128.828156bc.nishimura@mxp.nes.nec.co.jp> Message-Id: <20080618164349.37B6.KOSAKI.MOTOHIRO@jp.fujitsu.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Mailer: Becky! ver. 2.42 [ja] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1928 Lines: 70 > > > this part is really necessary? > > > I tryed to remove it, but any problem doesn't happend. > > > > > I made this part first, and added a fix for migration_entry_wait later. > > > > So, I haven't test without this part, and I think it will cause > > VM_BUG_ON() here without this part. > > > > Anyway, I will test it. > > > I got this VM_BUG_ON() as expected only by doing: > > # echo $$ >/cgroup/cpuset/02/tasks > > So, I beleive that both fixes for migration_entry_wait and > unmap_and_move (and, of course, removal VM_BUG_ON from > putback_lru_page) are needed. OK, I confirmed this part. Andrew, please pick. ================================================== Against: 2.6.26-rc5-mm3 remove redundant mapping check. we'd be doing exactly what putback_lru_page() is doing. So, this code as always unnecessary, duplicate code. So, just let putback_lru_page() handle this condition and conditionally unlock_page(). Signed-off-by: Daisuke Nishimura Signed-off-by: KOSAKI Motohiro Acked-by: Lee Schermerhorn --- mm/migrate.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) Index: b/mm/migrate.c =================================================================== --- a/mm/migrate.c +++ b/mm/migrate.c @@ -716,13 +716,7 @@ unlock: * restored. */ list_del(&page->lru); - if (!page->mapping) { - VM_BUG_ON(page_count(page) != 1); - unlock_page(page); - put_page(page); /* just free the old page */ - goto end_migration; - } else - unlock = putback_lru_page(page); + unlock = putback_lru_page(page); } if (unlock) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/