Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Guan Jing <guanjing6@huawei.com>
To:     <naoya.horiguchi@nec.com>, <linmiaohe@huawei.com>,
        <akpm@linux-foundation.org>
CC:     <djwong@kernel.org>, <dan.j.williams@intel.com>,
        <ruansy.fnst@fujitsu.com>, <linux-mm@kvack.org>,
        <linux-kernel@vger.kernel.org>, Guan Jing <guanjing6@huawei.com>
Subject: [PATCH -next] =?UTF-8?q?mm=EF=BC=9Afix=20build=20error=20of=20def?= =?UTF-8?q?ined=20but=20not=20used?=
Date:   Thu, 9 Jun 2022 13:00:28 +0800
Message-ID: <20220609050028.28645-1-guanjing6@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 8bit
Precedence: bulk

If CONFIG_HUGETLB_PAGE is not set and CONFIG_FS_DAX=y.
Use command "make ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu-" to
build, will fail:

mm/memory-failure.c:568:13: error: ‘collect_procs_fsdax’ defined
but not used [-Werror=unused-function]
	static void collect_procs_fsdax(struct page *page,
             ^~~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[1]: *** [mm/memory-failure.o] Error 1
make[1]: *** Waiting for unfinished jobs....
make: *** [mm] Error 2
make: *** Waiting for unfinished jobs....

so extending "#ifdef CONFIG_HUGETLB_PAG" to cover
collect_procs_fsdax() would be a simple resolution.

Reported-by: Hulk Robot <hulkci@huawei.com>
Fixes: 143ac5cd7289 ("mm: introduce mf_dax_kill_procs() for fsdax case")
Signed-off-by: Guan Jing <guanjing6@huawei.com>
---
 mm/memory-failure.c | 56 ++++++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 545f402c4890..952f117e4584 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -561,34 +561,6 @@ static void collect_procs_file(struct page *page, struct list_head *to_kill,
 	i_mmap_unlock_read(mapping);
 }
 
-#ifdef CONFIG_FS_DAX
-/*
- * Collect processes when the error hit a fsdax page.
- */
-static void collect_procs_fsdax(struct page *page,
-		struct address_space *mapping, pgoff_t pgoff,
-		struct list_head *to_kill)
-{
-	struct vm_area_struct *vma;
-	struct task_struct *tsk;
-
-	i_mmap_lock_read(mapping);
-	read_lock(&tasklist_lock);
-	for_each_process(tsk) {
-		struct task_struct *t = task_early_kill(tsk, true);
-
-		if (!t)
-			continue;
-		vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) {
-			if (vma->vm_mm == t->mm)
-				add_to_kill(t, page, pgoff, vma, to_kill);
-		}
-	}
-	read_unlock(&tasklist_lock);
-	i_mmap_unlock_read(mapping);
-}
-#endif /* CONFIG_FS_DAX */
-
 /*
  * Collect the processes who have the corrupted page mapped to kill.
  */
@@ -1540,6 +1512,34 @@ static int try_to_split_thp_page(struct page *page, const char *msg)
 }
 
 #ifdef CONFIG_HUGETLB_PAGE
+#ifdef CONFIG_FS_DAX
+/*
+ * Collect processes when the error hit a fsdax page.
+ */
+static void collect_procs_fsdax(struct page *page,
+		struct address_space *mapping, pgoff_t pgoff,
+		struct list_head *to_kill)
+{
+	struct vm_area_struct *vma;
+	struct task_struct *tsk;
+
+	i_mmap_lock_read(mapping);
+	read_lock(&tasklist_lock);
+	for_each_process(tsk) {
+		struct task_struct *t = task_early_kill(tsk, true);
+
+		if (!t)
+			continue;
+		vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) {
+			if (vma->vm_mm == t->mm)
+				add_to_kill(t, page, pgoff, vma, to_kill);
+		}
+	}
+	read_unlock(&tasklist_lock);
+	i_mmap_unlock_read(mapping);
+}
+#endif /* CONFIG_FS_DAX */
+
 /*
  * Called from hugetlb code with hugetlb_lock held.
  *
-- 
2.17.1