Message ID | 20200325220309.9803-1-richard.weiyang@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/2] mm/swapfile.c: simplify the calculation of n_goal | expand |
diff --git a/mm/swapfile.c b/mm/swapfile.c index 2c33ff456ed5..85b151d73128 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1004,11 +1004,7 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size) if (avail_pgs <= 0) goto noswap; - if (n_goal > SWAP_BATCH) - n_goal = SWAP_BATCH; - - if (n_goal > avail_pgs) - n_goal = avail_pgs; + n_goal = min3((long)n_goal, (long)SWAP_BATCH, avail_pgs); atomic_long_sub(n_goal * size, &nr_swap_pages);
Use min3() to simplify the comparison and make it more self-explaining. Signed-off-by: Wei Yang <richard.weiyang@gmail.com> --- mm/swapfile.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)