usermodehelper: kill umh_wait, renumber UMH_* constants

BugLink: http://bugs.launchpad.net/bugs/963685

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>
(cherry picked from commit 9d944ef32e83405a07376f112e9f02161d3e9731)

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Andy Whitcroft <andy.whitcroft@canonical.com>

1 files changed, 7 insertions, 11 deletions

diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 846f5695230..0f2c5a6b054 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;
 struct cred;
 struct file;
 
-enum umh_wait {
-        UMH_NO_WAIT = -1,       /* don't wait at all */
-        UMH_WAIT_EXEC = 0,      /* wait for the exec, but not the process */
-        UMH_WAIT_PROC = 1,      /* wait for the process to complete */
-};
-
+#define UMH_NO_WAIT     0       /* don't wait at all */
+#define UMH_WAIT_EXEC   1       /* wait for the exec, but not the process */
+#define UMH_WAIT_PROC   2       /* wait for the process to complete */
 #define UMH_KILLABLE    4       /* wait for EXEC/PROC killable */
 
 struct subprocess_info {
@@ -62,7 +59,7 @@ struct subprocess_info {
         char *path;
         char **argv;
         char **envp;
-        enum umh_wait wait;
+        int wait;
         int retval;
         int (*init)(struct subprocess_info *info, struct cred *new);
         void (*cleanup)(struct subprocess_info *info);
@@ -80,7 +77,7 @@ void call_usermodehelper_setfns(struct subprocess_info *info,
                     void *data);
 
 /* Actually execute the sub-process */
-int call_usermodehelper_exec(struct subprocess_info *info, enum umh_wait wait);
+int call_usermodehelper_exec(struct subprocess_info *info, int wait);
 
 /* Free the subprocess_info. This is only needed if you're not going
    to call call_usermodehelper_exec */
@@ -89,8 +86,7 @@ void call_usermodehelper_freeinfo(struct subprocess_info *info);
 extern void populate_rootfs_wait(void);
 
 static inline int
-call_usermodehelper_fns(char *path, char **argv, char **envp,
-                        enum umh_wait wait,
+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)
 {
@@ -110,7 +106,7 @@ call_usermodehelper_fns(char *path, char **argv, char **envp,
 }
 
 static inline int
-call_usermodehelper(char *path, char **argv, char **envp, enum umh_wait wait)
+call_usermodehelper(char *path, char **argv, char **envp, int wait)
 {
         return call_usermodehelper_fns(path, argv, envp, wait,
                                        NULL, NULL, NULL);