mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-24 20:54:10 +08:00
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.com Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Alexei Starovoitov <ast@kernel.org> Tested-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
This commit is contained in:
parent
b044fa2ae5
commit
3a171042ae
10
kernel/umh.c
10
kernel/umh.c
@ -429,7 +429,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];
|
||||
@ -470,11 +470,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);
|
||||
@ -520,8 +520,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 New Issue
Block a user