Commit d69a9575 authored by Zhen Lei's avatar Zhen Lei Committed by Linus Torvalds
Browse files

mm/swap_slots.c: simplify enable_swap_slots_cache() 



Whether swap_slot_cache_initialized is true or false,
__reenable_swap_slots_cache() is always called.  To make this meaning
clear, leave only one call to __reenable_swap_slots_cache().  This also
make it clearer what extra needs be done when swap_slot_cache_initialized
is false.

No functional change.

Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Acked-by: default avatarTim Chen <tim.c.chen@linux.intel.com>
Link: http://lkml.kernel.org/r/20200430061143.450-3-thunder.leizhen@huawei.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f90eae2a

mm/swap_slots.c

+10 −12
Original line number Diff line number Diff line
@@ -240,13 +240,9 @@ static int free_slot_cache(unsigned int cpu) 


int enable_swap_slots_cache(void)

{

	int ret = 0;



	mutex_lock(&swap_slots_cache_enable_mutex);

	if (swap_slot_cache_initialized) {

		__reenable_swap_slots_cache();

		goto out_unlock;

	}

	if (!swap_slot_cache_initialized) {

		int ret;



		ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "swap_slots_cache",

					alloc_swap_slot_cache, free_slot_cache);
@@ -255,6 +251,8 @@ int enable_swap_slots_cache(void) 
			goto out_unlock;



		swap_slot_cache_initialized = true;

	}



	__reenable_swap_slots_cache();

out_unlock:

	mutex_unlock(&swap_slots_cache_enable_mutex);