mm/hugetlb: Use str_plural() in report_hugepages()
Subsystems (2)
PATCH 1/1 mm/hugetlb: Use str_plural() in report_hugepages()
Use the string choice helper function str_plural() to simplify the code and to fix the following Coccinelle/coccicheck warning reported by string_choices.cocci:
opportunity for str_plural(nrinvalid)
--- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
mm/hugetlb.c +2 -1
@@ -25,6 +25,7 @@#include <linux/mmdebug.h> #include <linux/sched/signal.h> #include <linux/rmap.h> +#include <linux/string_choices.h> #include <linux/string_helpers.h> #include <linux/swap.h> #include <linux/swapops.h>
@@ -3724,7 +3725,7 @@ static void __init report_hugepages(void) buf, h->nr_huge_pages);if (nrinvalid)pr_info ("HugeTLB: %s page size: %lu invalid page%s discarded\n" , - buf, nrinvalid, nrinvalid >1 ?"s" :"" ); + buf, nrinvalid,str_plural (nrinvalid));pr_info ("HugeTLB: %d KiB vmemmap can be freed for a %s page\n" ,hugetlb_vmemmap_optimizable_size (h) /SZ_1K , buf); }
Signature · 1 line
2.50.0
Quoted 24 lines · Thorsten Blum
Use the string choice helper function
str_plural()to simplify the code and to fix the following Coccinelle/coccicheck warning reported bystring_choices.cocci:opportunity for
str_plural(nrinvalid)Signed-off-by Thorsten Blum <[email protected]>--- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/hugetlb.c +1
-0@@ -25,6 +25,7 @@#include <linux/mmdebug.h> #include <linux/sched/signal.h> #include <linux/rmap.h> +#include <linux/string_choices.h> #include <linux/string_helpers.h> #include <linux/swap.h> #include <linux/swapops.h>
mm/hugetlb.c static void __init report_hugepages(void) · line 3731
Quoted 8 lines
mm/hugetlb.c +1
-1@@ -3724,7 +3725,7 @@ static void __init report_hugepages(void) buf, h->nr_huge_pages);if (nrinvalid)pr_info ("HugeTLB: %s page size: %lu invalid page%s discarded\n" , - buf, nrinvalid, nrinvalid >1 ?"s" :"" ); + buf, nrinvalid,str_plural (nrinvalid));pr_info ("HugeTLB: %d KiB vmemmap can be freed for a %s page\n" ,hugetlb_vmemmap_optimizable_size (h) /SZ_1K , buf); }
LGTM
Quoted 24 lines · Thorsten Blum
Use the string choice helper function
str_plural()to simplify the code and to fix the following Coccinelle/coccicheck warning reported bystring_choices.cocci:opportunity for
str_plural(nrinvalid)Signed-off-by Thorsten Blum <[email protected]>--- mm/hugetlb.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)mm/hugetlb.c +1
-0@@ -25,6 +25,7 @@#include <linux/mmdebug.h> #include <linux/sched/signal.h> #include <linux/rmap.h> +#include <linux/string_choices.h> #include <linux/string_helpers.h> #include <linux/swap.h> #include <linux/swapops.h>
mm/hugetlb.c static void __init report_hugepages(void) · line 3731
Quoted 8 lines
mm/hugetlb.c +1
-1@@ -3724,7 +3725,7 @@ static void __init report_hugepages(void) buf, h->nr_huge_pages);if (nrinvalid)pr_info ("HugeTLB: %s page size: %lu invalid page%s discarded\n" , - buf, nrinvalid, nrinvalid >1 ?"s" :"" ); + buf, nrinvalid,str_plural (nrinvalid));pr_info ("HugeTLB: %d KiB vmemmap can be freed for a %s page\n" ,hugetlb_vmemmap_optimizable_size (h) /SZ_1K , buf); }
Seems like there be more than one place where such str_plural() changes could be made. Hence could you please collate them all part of a series instead.
Quoted 3 lines · Anshuman Khandual
Seems like there be more than one place where such
str_plural()changes could be made. Hence could you please collate them all part of a series instead.
There are only two instances under mm/ and I didn't think a patch series would be necessary.
Thanks,
Thorsten
Anshuman Khandual
Reviewed-byQuoted 7 lines · Thorsten Blum
Quoted 3 lines · Anshuman Khandual
Seems like there be more than one place where such
str_plural()changes could be made. Hence could you please collate them all part of a series instead.There are only two instances under
mm/and I didn't think a patch series would be necessary.
Reasonable enough.
LGTM.
Quoted 8 lines · Thorsten Blum
Use the string choice helper function
str_plural()to simplify the code and to fix the following Coccinelle/coccicheck warning reported bystring_choices.cocci:opportunity for
str_plural(nrinvalid)Signed-off-by Thorsten Blum <[email protected]>---
Signature · 3 lines
Cheers, David / dhildenb
Quoted 7 lines · Thorsten Blum
Use the string choice helper function
str_plural()to simplify the code and to fix the following Coccinelle/coccicheck warning reported bystring_choices.cocci:opportunity for
str_plural(nrinvalid)Signed-off-by Thorsten Blum <[email protected]>
Signature · 2 lines
Oscar Salvador SUSE Labs