diff options
author | Oleg Nesterov <oleg@redhat.com> | 2012-03-23 18:02:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 19:58:41 -0400 |
commit | 9d944ef32e83405a07376f112e9f02161d3e9731 (patch) | |
tree | 24170ff64fb83221da133e2afb53f58e840a6eee /include/linux | |
parent | d0bd587a80960d7ba7e0c8396e154028c9045c54 (diff) |
usermodehelper: kill umh_wait, renumber UMH_* constants
No functional changes. It is not sane to use UMH_KILLABLE with enum
umh_wait, but obviously we do not want another argument in
call_usermodehelper_* helpers. Kill this enum, use the plain int.
Signed-off-by: Oleg Nesterov <oleg@redhat.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tejun Heo <tj@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/kmod.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/linux/kmod.h b/include/linux/kmod.h index 1b5985855ffc..9efeae679106 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h | |||
@@ -48,12 +48,9 @@ static inline int request_module_nowait(const char *name, ...) { return -ENOSYS; | |||
48 | struct cred; | 48 | struct cred; |
49 | struct file; | 49 | struct file; |
50 | 50 | ||
51 | enum umh_wait { | 51 | #define UMH_NO_WAIT 0 /* don't wait at all */ |
52 | UMH_NO_WAIT = -1, /* don't wait at all */ | 52 | #define UMH_WAIT_EXEC 1 /* wait for the exec, but not the process */ |
53 | UMH_WAIT_EXEC = 0, /* wait for the exec, but not the process */ | 53 | #define UMH_WAIT_PROC 2 /* wait for the process to complete */ |
54 | UMH_WAIT_PROC = 1, /* wait for the process to complete */ | ||
55 | }; | ||
56 | |||
57 | #define UMH_KILLABLE 4 /* wait for EXEC/PROC killable */ | 54 | #define UMH_KILLABLE 4 /* wait for EXEC/PROC killable */ |
58 | 55 | ||
59 | struct subprocess_info { | 56 | struct subprocess_info { |
@@ -62,7 +59,7 @@ struct subprocess_info { | |||
62 | char *path; | 59 | char *path; |
63 | char **argv; | 60 | char **argv; |
64 | char **envp; | 61 | char **envp; |
65 | enum umh_wait wait; | 62 | int wait; |
66 | int retval; | 63 | int retval; |
67 | int (*init)(struct subprocess_info *info, struct cred *new); | 64 | int (*init)(struct subprocess_info *info, struct cred *new); |
68 | void (*cleanup)(struct subprocess_info *info); | 65 | void (*cleanup)(struct subprocess_info *info); |
@@ -80,15 +77,14 @@ void call_usermodehelper_setfns(struct subprocess_info *info, | |||
80 | void *data); | 77 | void *data); |
81 | 78 | ||
82 | /* Actually execute the sub-process */ | 79 | /* Actually execute the sub-process */ |
83 | int call_usermodehelper_exec(struct subprocess_info *info, enum umh_wait wait); | 80 | int call_usermodehelper_exec(struct subprocess_info *info, int wait); |
84 | 81 | ||
85 | /* Free the subprocess_info. This is only needed if you're not going | 82 | /* Free the subprocess_info. This is only needed if you're not going |
86 | to call call_usermodehelper_exec */ | 83 | to call call_usermodehelper_exec */ |
87 | void call_usermodehelper_freeinfo(struct subprocess_info *info); | 84 | void call_usermodehelper_freeinfo(struct subprocess_info *info); |
88 | 85 | ||
89 | static inline int | 86 | static inline int |
90 | call_usermodehelper_fns(char *path, char **argv, char **envp, | 87 | call_usermodehelper_fns(char *path, char **argv, char **envp, int wait, |
91 | enum umh_wait wait, | ||
92 | int (*init)(struct subprocess_info *info, struct cred *new), | 88 | int (*init)(struct subprocess_info *info, struct cred *new), |
93 | void (*cleanup)(struct subprocess_info *), void *data) | 89 | void (*cleanup)(struct subprocess_info *), void *data) |
94 | { | 90 | { |
@@ -106,7 +102,7 @@ call_usermodehelper_fns(char *path, char **argv, char **envp, | |||
106 | } | 102 | } |
107 | 103 | ||
108 | static inline int | 104 | static inline int |
109 | call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait) | 105 | call_usermodehelper(char *path, char **argv, char **envp, int wait) |
110 | { | 106 | { |
111 | return call_usermodehelper_fns(path, argv, envp, wait, | 107 | return call_usermodehelper_fns(path, argv, envp, wait, |
112 | NULL, NULL, NULL); | 108 | NULL, NULL, NULL); |