Skip to contentSkip to conversation

coredump: fix compile warning when ELF_CORE=n while COREDUMP=y

PATCH Superseded Jisheng Zhang 2 participants 3 messages Nov 28, 2022 VFS

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 coredump: fix compile warning when ELF_CORE=n while COREDUMP=y

fix below build warning when ELF_CORE=n while COREDUMP=y:

fs/coredump.c:834:12: warning: ‘dump_emit_page’ defined but not used [-Wunused-function]
834 | static int dump_emit_page(struct coredump_params *cprm, struct

      page *page)
      |            ^~~~~~~~~~~~~~
---
 fs/coredump.c | 2 ++
 1 file changed, 2 insertions(+)
fs/coredump.c +2 -0
index 7bad7785e8e6..8663042ebe9c 100644
@@ -831,6 +831,7 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr)
 	}
 }
 
+#ifdef CONFIG_ELF_CORE
 static int dump_emit_page(struct coredump_params *cprm, struct page *page)
 {
 	struct bio_vec bvec = {
@@ -863,6 +864,7 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
 
 	return 1;
 }
+#endif
 
 int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
 {
Signature · 1 line
2.37.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · Jisheng Zhang

fix below build warning when ELF_CORE=n while COREDUMP=y:

fs/coredump.c:834:12: warning: ‘dump_emit_page’ defined but not used [-Wunused-function]
834 | static int dump_emit_page(struct coredump_params *cprm, struct

      page *page)
      |            ^~~~~~~~~~~~~~
Fixes 06bbaa6dc53c: "[coredump] don't use __kernel_write() on kmap_local_page()"
Quoted 11 lines
---
 fs/coredump.c | 2 ++
 1 file changed, 2 insertions(+)
fs/coredump.c +0 -0
index 7bad7785e8e6..8663042ebe9c 100644

fs/coredump.c static int __dump_skip(struct coredump_params *cprm, size_t nr) · line 834

Quoted 4 lines
fs/coredump.c +1 -0
@@ -831,6 +831,7 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr)
 	}
 }
 
+#ifdef CONFIG_ELF_CORE

Instead of this ^^^, we could even move the definition of dump_emit_page() in the same #ifdef as of dump_user_range(). Since dump_user_range() is the only caller of dump_emit_page().

#ifdef CONFIG_ELF_CORE
[here]
int dump_user_range(struct coredump_params *cprm, unsigned long start,
unsigned long len)
{..}
#endif

But I guess that's just a nitpick. Feel free to add:

-ritesh

Quoted 14 lines
fs/coredump.c +1 -1
 static int dump_emit_page(struct coredump_params *cprm, struct page *page)
 {
 	struct bio_vec bvec = {
@@ -863,6 +864,7 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
 
 	return 1;
 }
+#endif
 
 int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
 {
--

2.37.2

#2 lore raw
Quoted 30 lines · Ritesh Harjani (IBM)
Quoted 6 lines · Jisheng Zhang

fix below build warning when ELF_CORE=n while COREDUMP=y:

fs/coredump.c:834:12: warning: ‘dump_emit_page’ defined but not used [-Wunused-function]
834 | static int dump_emit_page(struct coredump_params *cprm, struct

      page *page)
      |            ^~~~~~~~~~~~~~
Fixes 06bbaa6dc53c: "[coredump] don't use __kernel_write() on kmap_local_page()"
Quoted 11 lines
---
 fs/coredump.c | 2 ++
 1 file changed, 2 insertions(+)
fs/coredump.c +0 -0
index 7bad7785e8e6..8663042ebe9c 100644

fs/coredump.c static int __dump_skip(struct coredump_params *cprm, size_t nr) · line 834

Quoted 4 lines
fs/coredump.c +1 -0
@@ -831,6 +831,7 @@ static int __dump_skip(struct coredump_params *cprm, size_t nr)
 	}
 }
 
+#ifdef CONFIG_ELF_CORE

Instead of this ^^^, we could even move the definition of dump_emit_page() in the same #ifdef as of dump_user_range(). Since dump_user_range() is the only caller of dump_emit_page().

Quoted 7 lines

#ifdef CONFIG_ELF_CORE
[here]
int dump_user_range(struct coredump_params *cprm, unsigned long start,
unsigned long len)
{..}
#endif

I planed to patch like this, but I saw the final patch diffstat was a bit more. I'll send out a v2.

Thanks

Quoted 20 lines

But I guess that's just a nitpick. Feel free to add:

-ritesh

Quoted 14 lines
fs/coredump.c +1 -1
 static int dump_emit_page(struct coredump_params *cprm, struct page *page)
 {
 	struct bio_vec bvec = {
@@ -863,6 +864,7 @@ static int dump_emit_page(struct coredump_params *cprm, struct page *page)
 
 	return 1;
 }
+#endif
 
 int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
 {
--

2.37.2