diff options
Diffstat (limited to 'include/linux/kmod.h')
-rw-r--r-- | include/linux/kmod.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 5c058778ad35..d876dce217f0 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h | |||
@@ -72,8 +72,6 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv, | |||
72 | char **envp, gfp_t gfp_mask); | 72 | char **envp, gfp_t gfp_mask); |
73 | 73 | ||
74 | /* Set various pieces of state into the subprocess_info structure */ | 74 | /* Set various pieces of state into the subprocess_info structure */ |
75 | void call_usermodehelper_setkeys(struct subprocess_info *info, | ||
76 | struct key *session_keyring); | ||
77 | void call_usermodehelper_setfns(struct subprocess_info *info, | 75 | void call_usermodehelper_setfns(struct subprocess_info *info, |
78 | int (*init)(struct subprocess_info *info), | 76 | int (*init)(struct subprocess_info *info), |
79 | void (*cleanup)(struct subprocess_info *info), | 77 | void (*cleanup)(struct subprocess_info *info), |
@@ -112,21 +110,6 @@ call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait) | |||
112 | NULL, NULL, NULL); | 110 | NULL, NULL, NULL); |
113 | } | 111 | } |
114 | 112 | ||
115 | static inline int | ||
116 | call_usermodehelper_keys(char *path, char **argv, char **envp, | ||
117 | struct key *session_keyring, enum umh_wait wait) | ||
118 | { | ||
119 | struct subprocess_info *info; | ||
120 | gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; | ||
121 | |||
122 | info = call_usermodehelper_setup(path, argv, envp, gfp_mask); | ||
123 | if (info == NULL) | ||
124 | return -ENOMEM; | ||
125 | |||
126 | call_usermodehelper_setkeys(info, session_keyring); | ||
127 | return call_usermodehelper_exec(info, wait); | ||
128 | } | ||
129 | |||
130 | extern void usermodehelper_init(void); | 113 | extern void usermodehelper_init(void); |
131 | 114 | ||
132 | extern int usermodehelper_disable(void); | 115 | extern int usermodehelper_disable(void); |