Commit cf01f6f5 authored Oct 26, 2018 by Oscar Salvador Committed by Linus Torvalds Oct 26, 2018

mm/memory_hotplug.c: tidy up node_states_clear_node()

node_states_clear has the following if statements:

if ((N_MEMORY != N_NORMAL_MEMORY) &&
    (arg->status_change_nid_high >= 0))
        ...

if ((N_MEMORY != N_HIGH_MEMORY) &&
    (arg->status_change_nid >= 0))
        ...

N_MEMORY can never be equal to neither N_NORMAL_MEMORY nor
N_HIGH_MEMORY.

Similar problem was found in [1].
Since this is wrong, let us get rid of it.

[1] https://patchwork.kernel.org/patch/10579155/

Link: http://lkml.kernel.org/r/20180919100819.25518-4-osalvador@techadventures.net


Signed-off-by: Oscar Salvador <osalvador@suse.de>
Reviewed-by: Pavel Tatashin <pavel.tatashin@microsoft.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Cc: Mathieu Malaterre <malat@debian.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: <yasu.isimatu@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 83d83612

mm/memory_hotplug.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1582,12 +1582,10 @@ static void node_states_clear_node(int node, struct memory_notify *arg)
		if (arg->status_change_nid_normal >= 0)
		node_clear_state(node, N_NORMAL_MEMORY);

		if ((N_MEMORY != N_NORMAL_MEMORY) &&
		(arg->status_change_nid_high >= 0))
		if (arg->status_change_nid_high >= 0)
		node_clear_state(node, N_HIGH_MEMORY);

		if ((N_MEMORY != N_HIGH_MEMORY) &&
		(arg->status_change_nid >= 0))
		if (arg->status_change_nid >= 0)
		node_clear_state(node, N_MEMORY);
		}

Admin message