From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx199.postini.com [74.125.245.199]) by kanga.kvack.org (Postfix) with SMTP id 69D006B005D for ; Tue, 17 Jul 2012 08:35:01 -0400 (EDT) Received: by ghrr18 with SMTP id r18so413529ghr.14 for ; Tue, 17 Jul 2012 05:35:00 -0700 (PDT) From: Joonsoo Kim Subject: [PATCH 3/4 v2] mm: fix return value in __alloc_contig_migrate_range() Date: Tue, 17 Jul 2012 21:33:34 +0900 Message-Id: <1342528415-2291-3-git-send-email-js1304@gmail.com> In-Reply-To: <1342528415-2291-1-git-send-email-js1304@gmail.com> References: <1342528415-2291-1-git-send-email-js1304@gmail.com> Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Joonsoo Kim , Michal Nazarewicz , Marek Szyprowski , Minchan Kim , Christoph Lameter migrate_pages() would return positive value in some failure case, so 'ret > 0 ? 0 : ret' may be wrong. This fix it and remove one dead statement. Signed-off-by: Joonsoo Kim Cc: Michal Nazarewicz Cc: Marek Szyprowski Cc: Minchan Kim Cc: Christoph Lameter Acked-by: Christoph Lameter diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 4403009..02d4519 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5673,7 +5673,6 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) } tries = 0; } else if (++tries == 5) { - ret = ret < 0 ? ret : -EBUSY; break; } @@ -5683,7 +5682,7 @@ static int __alloc_contig_migrate_range(unsigned long start, unsigned long end) } putback_lru_pages(&cc.migratepages); - return ret > 0 ? 0 : ret; + return ret <= 0 ? ret : -EBUSY; } /* -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org