diff options
author | Lucas De Marchi <lucas.demarchi@profusion.mobi> | 2013-04-30 15:28:09 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-30 17:04:06 -0700 |
commit | 66e5b7e1948cdbdca2b0cc6ddc6d69ee84583fb4 (patch) | |
tree | aab4bddfc97523c11a7e3714644a29373c8d4a85 /include/linux/kmod.h | |
parent | 907ed1328d2a748f3d6028503d3e04c74ea62730 (diff) | |
download | linux-stable-66e5b7e1948cdbdca2b0cc6ddc6d69ee84583fb4.tar.gz linux-stable-66e5b7e1948cdbdca2b0cc6ddc6d69ee84583fb4.tar.bz2 linux-stable-66e5b7e1948cdbdca2b0cc6ddc6d69ee84583fb4.zip |
kmod: remove call_usermodehelper_fns()
This function suffers from not being able to determine if the cleanup is
called in case it returns -ENOMEM. Nobody is using it anymore, so let's
remove it.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: David Howells <dhowells@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tejun Heo <tj@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/kmod.h')
-rw-r--r-- | include/linux/kmod.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 7eebcf5d75f1..0555cc66a15b 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -67,9 +67,7 @@ struct subprocess_info { }; extern int -call_usermodehelper_fns(char *path, char **argv, char **envp, int wait, - int (*init)(struct subprocess_info *info, struct cred *new), - void (*cleanup)(struct subprocess_info *), void *data); +call_usermodehelper(char *path, char **argv, char **envp, int wait); extern struct subprocess_info * call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, @@ -79,13 +77,6 @@ call_usermodehelper_setup(char *path, char **argv, char **envp, gfp_t gfp_mask, extern int call_usermodehelper_exec(struct subprocess_info *info, int wait); -static inline int -call_usermodehelper(char *path, char **argv, char **envp, int wait) -{ - return call_usermodehelper_fns(path, argv, envp, wait, - NULL, NULL, NULL); -} - extern struct ctl_table usermodehelper_table[]; enum umh_disable_depth { |