Skip to contentSkip to conversation

coredump: rename umh_pipe_setup() to coredump_pipe_setup()

PATCH In review Luis R. Rodriguez 3 participants 5 messages May 7, 2018 – May 11, 2018

Subsystems (3)
Networking Network drivers VFS
lore
Share & tools
lore

Luis R. Rodriguez

author
#0 lore raw

PATCH 1/1 coredump: rename umh_pipe_setup() to coredump_pipe_setup()

This makes it clearer this code is part of the coredump code, and is not an exported generic helper from kernel/umh.c.

Signed-off-by Luis R. Rodriguez <[email protected]>
---
 fs/coredump.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
fs/coredump.c +5 -4
index 1e2c87acac9b..566504781683 100644
@@ -508,7 +508,7 @@ static void wait_for_dump_helpers(struct file *file)
 }
 
 /*
- * umh_pipe_setup
+ * coredump_pipe_setup
  * helper function to customize the process used
  * to collect the core in userspace.  Specifically
  * it sets up a pipe and installs it as fd 0 (stdin)

@@ -518,7 +518,7 @@ static void wait_for_dump_helpers(struct file *file)
  * is a special value that we use to trap recursive
  * core dumps
  */
-static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
+static int coredump_pipe_setup(struct subprocess_info *info, struct cred *new)
 {
 	struct file *files[2];
 	struct coredump_params *cp = (struct coredump_params *)info->data;

@@ -606,7 +606,7 @@ void do_coredump(const siginfo_t *siginfo)
 		}
 
 		if (cprm.limit == 1) {
-			/* See umh_pipe_setup() which sets RLIMIT_CORE = 1.
+			/* See coredump_pipe_setup() which sets RLIMIT_CORE = 1.
 			 *
 			 * Normally core limits are irrelevant to pipes, since
 			 * we're not writing to the file system, but we use

@@ -647,7 +647,8 @@ void do_coredump(const siginfo_t *siginfo)
 		retval = -ENOMEM;
 		sub_info = call_usermodehelper_setup(helper_argv[0],
 						helper_argv, NULL, GFP_KERNEL,
-						umh_pipe_setup, NULL, &cprm);
+						coredump_pipe_setup, NULL,
+						&cprm);
 		if (sub_info)
 			retval = call_usermodehelper_exec(sub_info,
 							  UMH_WAIT_EXEC);
Signature · 1 line
2.17.0
#1 lore raw
Quoted 22 lines · Luis R. Rodriguez

This makes it clearer this code is part of the coredump code, and is not an exported generic helper from kernel/umh.c.

Signed-off-by Luis R. Rodriguez <[email protected]>
---
 fs/coredump.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
fs/coredump.c +1 -1
index 1e2c87acac9b..566504781683 100644
@@ -508,7 +508,7 @@ static void wait_for_dump_helpers(struct file *file)
 }
 
 /*
- * umh_pipe_setup
+ * coredump_pipe_setup
  * helper function to customize the process used
  * to collect the core in userspace.  Specifically
  * it sets up a pipe and installs it as fd 0 (stdin)

fs/coredump.c static void wait_for_dump_helpers(struct file *file) · line 521

Quoted 5 lines
fs/coredump.c +1 -1
@@ -518,7 +518,7 @@ static void wait_for_dump_helpers(struct file *file)
  * is a special value that we use to trap recursive
  * core dumps
  */
-static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
+static int coredump_pipe_setup(struct subprocess_info *info, struct cred *new)

I think this renaming makes sense.
How do we want to proceed?
I can take it as part of my series and get the whole thing through net-next or folks want to apply this separately?

author
#2 lore raw
Quoted 25 lines · Alexei Starovoitov
Quoted 24 lines · Luis R. Rodriguez

This makes it clearer this code is part of the coredump code, and is not an exported generic helper from kernel/umh.c.

Signed-off-by Luis R. Rodriguez <[email protected]>
---
 fs/coredump.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
fs/coredump.c +1 -1
index 1e2c87acac9b..566504781683 100644
@@ -508,7 +508,7 @@ static void wait_for_dump_helpers(struct file *file)
 }
 
 /*
- * umh_pipe_setup
+ * coredump_pipe_setup
  * helper function to customize the process used
  * to collect the core in userspace.  Specifically
  * it sets up a pipe and installs it as fd 0 (stdin)

@@ -518,7 +518,7 @@ static void wait_for_dump_helpers(struct file *file)
  * is a special value that we use to trap recursive
  * core dumps
Quoted 8 lines

fs/coredump.c static void wait_for_dump_helpers(struct file *file) · line 521

Quoted 3 lines
fs/coredump.c +1 -1
  */
-static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
+static int coredump_pipe_setup(struct subprocess_info *info, struct cred *new)

I think this renaming makes sense.
How do we want to proceed?
I can take it as part of my series and get the whole thing through net-next or folks want to apply this separately?

I think net-next makes sense if Al Viro is OK with that. This way it could go in regardless of the state of your series, but it also lines up with your work.

Luis

maintainer
#3 lore raw
Quoted 2 lines · Luis R. Rodriguez

I think net-next makes sense if Al Viro is OK with that. This way it could go in regardless of the state of your series, but it also lines up with your work.

Fine by me...

author
#4 lore raw
Quoted 6 lines · Al Viro
Quoted 2 lines · Luis R. Rodriguez

I think net-next makes sense if Al Viro is OK with that. This way it could go in regardless of the state of your series, but it also lines up with your work.

Fine by me...

OK thanks.

Dave, I'll bounce a copy of the original patch to you, if anything else is needed please let me know.

Luis