From: Miaohe Lin <linmiaohe@huawei.com>
To: <akpm@linux-foundation.org>
Cc: <linux-mm@kvack.org>, <linux-kernel@vger.kernel.org>,
<linmiaohe@huawei.com>
Subject: [PATCH 4/4] mm/memory_hotplug: fix misplaced comment in offline_pages
Date: Mon, 7 Feb 2022 21:36:43 +0800 [thread overview]
Message-ID: <20220207133643.23427-5-linmiaohe@huawei.com> (raw)
In-Reply-To: <20220207133643.23427-1-linmiaohe@huawei.com>
It's misplaced since commit 7960509329c2 ("mm, memory_hotplug: print reason
for the offlining failure"). Move it to the right place.
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
---
mm/memory_hotplug.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
index 4b9eef861ee4..7dc7e12302db 100644
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@ -1966,6 +1966,7 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
return 0;
failed_removal_isolated:
+ /* pushback to free area */
undo_isolate_page_range(start_pfn, end_pfn, MIGRATE_MOVABLE);
memory_notify(MEM_CANCEL_OFFLINE, &arg);
failed_removal_pcplists_disabled:
@@ -1976,7 +1977,6 @@ int __ref offline_pages(unsigned long start_pfn, unsigned long nr_pages,
(unsigned long long) start_pfn << PAGE_SHIFT,
((unsigned long long) end_pfn << PAGE_SHIFT) - 1,
reason);
- /* pushback to free area */
mem_hotplug_done();
return ret;
}
--
2.23.0
next prev parent reply other threads:[~2022-02-07 13:37 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-07 13:36 [PATCH 0/4] A few cleanup patches around memory_hotplug Miaohe Lin
2022-02-07 13:36 ` [PATCH 1/4] mm/memory_hotplug: remove obsolete comment of __add_pages Miaohe Lin
2022-02-07 14:41 ` David Hildenbrand
2022-02-07 20:12 ` Andrew Morton
2022-02-08 10:15 ` Oscar Salvador
2022-02-08 10:56 ` Miaohe Lin
2022-02-07 13:36 ` [PATCH 2/4] mm/memory_hotplug: avoid calling zone_intersects() for ZONE_NORMAL Miaohe Lin
2022-02-07 14:50 ` David Hildenbrand
2022-02-08 10:06 ` Oscar Salvador
2022-02-07 13:36 ` [PATCH 3/4] mm/memory_hotplug: clean up try_offline_node Miaohe Lin
2022-02-07 14:46 ` David Hildenbrand
2022-02-08 10:08 ` Oscar Salvador
2022-02-07 13:36 ` Miaohe Lin [this message]
2022-02-07 14:45 ` [PATCH 4/4] mm/memory_hotplug: fix misplaced comment in offline_pages David Hildenbrand
2022-02-08 10:12 ` Oscar Salvador
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220207133643.23427-5-linmiaohe@huawei.com \
--to=linmiaohe@huawei.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox