OSDN Git Service

mm/page_alloc: use clamp() to simplify code
authorWang ShaoBo <bobo.shaobowang@huawei.com>
Fri, 5 Nov 2021 20:40:55 +0000 (13:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Nov 2021 20:30:38 +0000 (13:30 -0700)
This patch uses clamp() to simplify code in init_per_zone_wmark_min().

Link: https://lkml.kernel.org/r/20211021034830.1049150-1-bobo.shaobowang@huawei.com
Signed-off-by: Wang ShaoBo <bobo.shaobowang@huawei.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Cc: Wei Yongjun <weiyongjun1@huawei.com>
Cc: Li Bin <huawei.libin@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
mm/page_alloc.c

index 2aafc33..a703546 100644 (file)
@@ -8477,16 +8477,12 @@ int __meminit init_per_zone_wmark_min(void)
        lowmem_kbytes = nr_free_buffer_pages() * (PAGE_SIZE >> 10);
        new_min_free_kbytes = int_sqrt(lowmem_kbytes * 16);
 
-       if (new_min_free_kbytes > user_min_free_kbytes) {
-               min_free_kbytes = new_min_free_kbytes;
-               if (min_free_kbytes < 128)
-                       min_free_kbytes = 128;
-               if (min_free_kbytes > 262144)
-                       min_free_kbytes = 262144;
-       } else {
+       if (new_min_free_kbytes > user_min_free_kbytes)
+               min_free_kbytes = clamp(new_min_free_kbytes, 128, 262144);
+       else
                pr_warn("min_free_kbytes is not updated to %d because user defined value %d is preferred\n",
                                new_min_free_kbytes, user_min_free_kbytes);
-       }
+
        setup_per_zone_wmarks();
        refresh_zone_stat_thresholds();
        setup_per_zone_lowmem_reserve();