[PATCH] mm/migrate.c: take returned value of isolate_huge_page()(Re:[PATCH 4/9] migrate: add hugepage migration code to move_pages())

[Naoya Horiguchi]

On Tue, Nov 12, 2013 at 12:56:33PM +0100, Borislav Petkov wrote:
> On Mon, Sep 30, 2013 at 12:08:44PM -0400, Naoya Horiguchi wrote:
> > On Mon, Sep 30, 2013 at 06:04:50PM +0200, Borislav Petkov wrote:
> > > On Mon, Sep 30, 2013 at 11:01:03AM -0400, Naoya Horiguchi wrote:
> > > > Thanks for reporting. The patch should fix this.
> > > > 
> > > > Naoya Horiguchi
> > > > ---
> > > > From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
> > > > Date: Mon, 30 Sep 2013 10:22:26 -0400
> > > > Subject: [PATCH] mm/migrate.c: take returned value of isolate_huge_page()
> > > > 
> > > > Introduces a cosmetic substitution of the returned value of isolate_huge_page()
> > > > to suppress a build warning when !CONFIG_HUGETLBFS. No behavioral change.
> > > > 
> > > > Reported-by: Borislav Petkov <bp@xxxxxxxxx>
> > > > Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
> > > 
> > > Thanks for this. Unfortunately, I cannot trigger it anymore. :\ Maybe it
> > > is because I pulled latest git and this was triggering only on a older
> > > repo state, hmmm.
> > > 
> > > The patch looks obviously correct though so you could send it up or hold
> > > on to it until someone else reports it.
> > > 
> > > Anyway, sorry for the trouble.
> > 
> > OK, no problem :)
> 
> Hey Naoya,
> 
> I can trigger this issue again.
> 
> Kernel is latest Linus: v3.12-4849-g10d0c9705e80
> 
> Compiler is: gcc (Debian 4.8.1-10) 4.8.1, config is attached.
> 
> And yes, the patch you sent me previously is still good and fixes the
> warning so feel free to add my Tested-by: tag.

Sorry for late response, and thanks for testing!
Andrew, can you apply this fix?

Thanks,
Naoya Horiguchi
---
From: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
Date: Mon, 30 Sep 2013 10:22:26 -0400
Subject: [PATCH] mm/migrate.c: take returned value of isolate_huge_page()

Introduces a cosmetic substitution of the returned value of isolate_huge_page()
to suppress a build warning when !CONFIG_HUGETLBFS. No behavioral change.

Reported-by: Borislav Petkov <bp@xxxxxxxxx>
Tested-by: Borislav Petkov <bp@xxxxxxxxx>
Signed-off-by: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx>
---
 mm/migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index 4cd63c2..4a26042 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1168,7 +1168,7 @@ static int do_move_page_to_node_array(struct mm_struct *mm,
 			goto put_and_set;
 
 		if (PageHuge(page)) {
-			isolate_huge_page(page, &pagelist);
+			err = isolate_huge_page(page, &pagelist);
 			goto put_and_set;
 		}
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/