From: Naoya Horiguchi Date: Wed, 4 Jun 2014 23:10:35 +0000 (-0700) Subject: mm/memory-failure.c: move comment X-Git-Tag: v4.9.8~6270^2~16^2~103 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6edd6cc66201e06a6cc34030462217e7f4d72f4f;p=platform%2Fkernel%2Flinux-rpi3.git mm/memory-failure.c: move comment The comment about pages under writeback is far from the relevant code, so let's move it to the right place. Signed-off-by: Naoya Horiguchi Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 3cd1b65..a047468 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c @@ -1132,11 +1132,6 @@ int memory_failure(unsigned long pfn, int trapno, int flags) } } - /* - * Lock the page and wait for writeback to finish. - * It's very difficult to mess with pages currently under IO - * and in many cases impossible, so we just avoid it here. - */ lock_page(hpage); /* @@ -1186,6 +1181,10 @@ int memory_failure(unsigned long pfn, int trapno, int flags) if (PageHuge(p)) set_page_hwpoison_huge_page(hpage); + /* + * It's very difficult to mess with pages currently under IO + * and in many cases impossible, so we just avoid it here. + */ wait_on_page_writeback(p); /*