Commit e0f3ebba authored by Zhen Lei's avatar Zhen Lei Committed by Linus Torvalds

mm/swap_slots.c: remove redundant check for swap_slot_cache_initialized

Because enable_swap_slots_cache can only become true in
enable_swap_slots_cache(), and depends on swap_slot_cache_initialized is
true before.  That means, when enable_swap_slots_cache is true,
swap_slot_cache_initialized is true also.

So the condition:
"swap_slot_cache_enabled && swap_slot_cache_initialized"
can be reduced to "swap_slot_cache_enabled"

And in mathematics:
"!swap_slot_cache_enabled || !swap_slot_cache_initialized"
is equal to "!(swap_slot_cache_enabled && swap_slot_cache_initialized)"

So 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-4-thunder.leizhen@huawei.comSigned-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d69a9575
...@@ -46,8 +46,7 @@ static void __drain_swap_slots_cache(unsigned int type); ...@@ -46,8 +46,7 @@ static void __drain_swap_slots_cache(unsigned int type);
static void deactivate_swap_slots_cache(void); static void deactivate_swap_slots_cache(void);
static void reactivate_swap_slots_cache(void); static void reactivate_swap_slots_cache(void);
#define use_swap_slot_cache (swap_slot_cache_active && \ #define use_swap_slot_cache (swap_slot_cache_active && swap_slot_cache_enabled)
swap_slot_cache_enabled && swap_slot_cache_initialized)
#define SLOTS_CACHE 0x1 #define SLOTS_CACHE 0x1
#define SLOTS_CACHE_RET 0x2 #define SLOTS_CACHE_RET 0x2
...@@ -94,7 +93,7 @@ static bool check_cache_active(void) ...@@ -94,7 +93,7 @@ static bool check_cache_active(void)
{ {
long pages; long pages;
if (!swap_slot_cache_enabled || !swap_slot_cache_initialized) if (!swap_slot_cache_enabled)
return false; return false;
pages = get_nr_swap_pages(); pages = get_nr_swap_pages();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment