Commit 3a171042 authored by Eric W. Biederman's avatar Eric W. Biederman

umh: Rename the user mode driver helpers for clarity

Now that the functionality of umh_setup_pipe and
umh_clean_and_save_pid has changed their names are too specific and
don't make much sense.  Instead name them  umd_setup and umd_cleanup
for the functional role in setting up user mode drivers.

v1: https://lkml.kernel.org/r/875zbegf82.fsf_-_@x220.int.ebiederm.org
v2: https://lkml.kernel.org/r/87tuyt63x3.fsf_-_@x220.int.ebiederm.org
Link: https://lkml.kernel.org/r/20200702164140.4468-3-ebiederm@xmission.comReviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Tested-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent b044fa2a
...@@ -429,7 +429,7 @@ struct subprocess_info *call_usermodehelper_setup_file(struct file *file, ...@@ -429,7 +429,7 @@ struct subprocess_info *call_usermodehelper_setup_file(struct file *file,
return sub_info; return sub_info;
} }
static int umh_pipe_setup(struct subprocess_info *info, struct cred *new) static int umd_setup(struct subprocess_info *info, struct cred *new)
{ {
struct umh_info *umh_info = info->data; struct umh_info *umh_info = info->data;
struct file *from_umh[2]; struct file *from_umh[2];
...@@ -470,11 +470,11 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new) ...@@ -470,11 +470,11 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
return 0; return 0;
} }
static void umh_clean_and_save_pid(struct subprocess_info *info) static void umd_cleanup(struct subprocess_info *info)
{ {
struct umh_info *umh_info = info->data; struct umh_info *umh_info = info->data;
/* cleanup if umh_pipe_setup() was successful but exec failed */ /* cleanup if umh_setup() was successful but exec failed */
if (info->retval) { if (info->retval) {
fput(umh_info->pipe_to_umh); fput(umh_info->pipe_to_umh);
fput(umh_info->pipe_from_umh); fput(umh_info->pipe_from_umh);
...@@ -520,8 +520,8 @@ int fork_usermode_blob(void *data, size_t len, struct umh_info *info) ...@@ -520,8 +520,8 @@ int fork_usermode_blob(void *data, size_t len, struct umh_info *info)
} }
err = -ENOMEM; err = -ENOMEM;
sub_info = call_usermodehelper_setup_file(file, umh_pipe_setup, sub_info = call_usermodehelper_setup_file(file, umd_setup, umd_cleanup,
umh_clean_and_save_pid, info); info);
if (!sub_info) if (!sub_info)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment