mm: cma: use CMA_MAX_NAME to define the length of cma name array

CMA_MAX_NAME should be visible to CMA's users as they might need it to set
the name of CMA areas and avoid hardcoding the size locally.
So this patch moves CMA_MAX_NAME from local header file to include/linux
header file and removes the hardcode in both hugetlb.c and contiguous.c.

Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/include/linux/cma.h b/include/linux/cma.h
index 6ff79fefd01fd28a9aae7a3e8506a5bee5a7a759..217999c8a7621968f9c11f66198649ade9eefa54 100644 (file)
--- a/include/linux/cma.h
+++ b/include/linux/cma.h
@@ -18,6 +18,8 @@
 
 #endif
 
+#define CMA_MAX_NAME 64
+
 struct cma;
 
 extern unsigned long totalcma_pages;

diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c
index aa53384fd7dcaba8c3e9f3072d54495fd2923d55..f4c150810fd25ce385f63955ec3927a9c99b824f 100644 (file)
--- a/kernel/dma/contiguous.c
+++ b/kernel/dma/contiguous.c
@@ -119,7 +119,7 @@ void __init dma_pernuma_cma_reserve(void)
 
        for_each_online_node(nid) {
                int ret;
-               char name[20];
+               char name[CMA_MAX_NAME];
                struct cma **cma = &dma_contiguous_pernuma_area[nid];
 
                snprintf(name, sizeof(name), "pernuma%d", nid);

diff --git a/mm/cma.h b/mm/cma.h
index 20f6e24bc477bdfa428cb158bdf47503f30db27d..42ae082cb067d15087534d3ef7069a75a7b84619 100644 (file)
--- a/mm/cma.h
+++ b/mm/cma.h
@@ -4,8 +4,6 @@
 
 #include <linux/debugfs.h>
 
-#define CMA_MAX_NAME 64
-
 struct cma {
        unsigned long   base_pfn;
        unsigned long   count;

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index a301c2d672bf5246f1ec4bf709374b3b78489189..9eec0ea9ba68a1c22be4d11b5d6b7eb3152e88be 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -5683,12 +5683,12 @@ void __init hugetlb_cma_reserve(int order)
        reserved = 0;
        for_each_node_state(nid, N_ONLINE) {
                int res;
-               char name[20];
+               char name[CMA_MAX_NAME];
 
                size = min(per_node, hugetlb_cma_size - reserved);
                size = round_up(size, PAGE_SIZE << order);
 
-               snprintf(name, 20, "hugetlb%d", nid);
+               snprintf(name, sizeof(name), "hugetlb%d", nid);
                res = cma_declare_contiguous_nid(0, size, 0, PAGE_SIZE << order,
                                                 0, false, name,
                                                 &hugetlb_cma[nid], nid);