mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
UPSTREAM: 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/[email protected] v2: https://lkml.kernel.org/r/[email protected] Link: https://lkml.kernel.org/r/[email protected] Reviewed-by: Greg Kroah-Hartman <[email protected]> Acked-by: Alexei Starovoitov <[email protected]> Tested-by: Alexei Starovoitov <[email protected]> Change-Id: I7961ca7046d4dcaaed084ebc41569a25fb0942ed Signed-off-by: "Eric W. Biederman" <[email protected]>
This commit is contained in:
parent
dcca0a0837
commit
8f74e76f49
1 changed files with 5 additions and 5 deletions
10
kernel/umh.c
10
kernel/umh.c
|
|
@ -440,7 +440,7 @@ struct subprocess_info *call_usermodehelper_setup_file(struct file *file,
|
|||
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 file *from_umh[2];
|
||||
|
|
@ -480,11 +480,11 @@ static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
|
|||
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;
|
||||
|
||||
/* cleanup if umh_pipe_setup() was successful but exec failed */
|
||||
/* cleanup if umh_setup() was successful but exec failed */
|
||||
if (info->retval) {
|
||||
fput(umh_info->pipe_to_umh);
|
||||
fput(umh_info->pipe_from_umh);
|
||||
|
|
@ -530,8 +530,8 @@ int fork_usermode_blob(void *data, size_t len, struct umh_info *info)
|
|||
}
|
||||
|
||||
err = -ENOMEM;
|
||||
sub_info = call_usermodehelper_setup_file(file, umh_pipe_setup,
|
||||
umh_clean_and_save_pid, info);
|
||||
sub_info = call_usermodehelper_setup_file(file, umd_setup, umd_cleanup,
|
||||
info);
|
||||
if (!sub_info)
|
||||
goto out;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue