In the future usermode helper users do not need to carry in
all the of kmod headers declarations.

Since kmod.h still includes umh.h this change has no functional
changes, each umh user can be cleaned up separately later and with
time.

Signed-off-by: Luis R. Rodriguez <mcg...@kernel.org>
---
 MAINTAINERS          |  1 +
 include/linux/kmod.h | 60 +--------------------------------------------
 include/linux/umh.h  | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 71 insertions(+), 59 deletions(-)
 create mode 100644 include/linux/umh.h

diff --git a/MAINTAINERS b/MAINTAINERS
index a3677eaacd1e..a11f47000bdf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7428,6 +7428,7 @@ M:        "Luis R. Rodriguez" <mcg...@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 F:     kernel/umh.c
+F:     include/linux/umh.h
 
 KERNEL VIRTUAL MACHINE (KVM)
 M:     Paolo Bonzini <pbonz...@redhat.com>
diff --git a/include/linux/kmod.h b/include/linux/kmod.h
index 655082c88fd9..40c89ad4bea6 100644
--- a/include/linux/kmod.h
+++ b/include/linux/kmod.h
@@ -19,6 +19,7 @@
  *      Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/umh.h>
 #include <linux/gfp.h>
 #include <linux/stddef.h>
 #include <linux/errno.h>
@@ -44,63 +45,4 @@ static inline int request_module_nowait(const char *name, 
...) { return -ENOSYS;
 #define try_then_request_module(x, mod...) (x)
 #endif
 
-
-struct cred;
-struct file;
-
-#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 {
-       struct work_struct work;
-       struct completion *complete;
-       const char *path;
-       char **argv;
-       char **envp;
-       int wait;
-       int retval;
-       int (*init)(struct subprocess_info *info, struct cred *new);
-       void (*cleanup)(struct subprocess_info *info);
-       void *data;
-} __randomize_layout;
-
-extern int
-call_usermodehelper(const char *path, char **argv, char **envp, int wait);
-
-extern struct subprocess_info *
-call_usermodehelper_setup(const char *path, char **argv, char **envp,
-                         gfp_t gfp_mask,
-                         int (*init)(struct subprocess_info *info, struct cred 
*new),
-                         void (*cleanup)(struct subprocess_info *), void 
*data);
-
-extern int
-call_usermodehelper_exec(struct subprocess_info *info, int wait);
-
-extern struct ctl_table usermodehelper_table[];
-
-enum umh_disable_depth {
-       UMH_ENABLED = 0,
-       UMH_FREEZING,
-       UMH_DISABLED,
-};
-
-extern int __usermodehelper_disable(enum umh_disable_depth depth);
-extern void __usermodehelper_set_disable_depth(enum umh_disable_depth depth);
-
-static inline int usermodehelper_disable(void)
-{
-       return __usermodehelper_disable(UMH_DISABLED);
-}
-
-static inline void usermodehelper_enable(void)
-{
-       __usermodehelper_set_disable_depth(UMH_ENABLED);
-}
-
-extern int usermodehelper_read_trylock(void);
-extern long usermodehelper_read_lock_wait(long timeout);
-extern void usermodehelper_read_unlock(void);
-
 #endif /* __LINUX_KMOD_H__ */
diff --git a/include/linux/umh.h b/include/linux/umh.h
new file mode 100644
index 000000000000..244aff638220
--- /dev/null
+++ b/include/linux/umh.h
@@ -0,0 +1,69 @@
+#ifndef __LINUX_UMH_H__
+#define __LINUX_UMH_H__
+
+#include <linux/gfp.h>
+#include <linux/stddef.h>
+#include <linux/errno.h>
+#include <linux/compiler.h>
+#include <linux/workqueue.h>
+#include <linux/sysctl.h>
+
+struct cred;
+struct file;
+
+#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 {
+       struct work_struct work;
+       struct completion *complete;
+       const char *path;
+       char **argv;
+       char **envp;
+       int wait;
+       int retval;
+       int (*init)(struct subprocess_info *info, struct cred *new);
+       void (*cleanup)(struct subprocess_info *info);
+       void *data;
+} __randomize_layout;
+
+extern int
+call_usermodehelper(const char *path, char **argv, char **envp, int wait);
+
+extern struct subprocess_info *
+call_usermodehelper_setup(const char *path, char **argv, char **envp,
+                         gfp_t gfp_mask,
+                         int (*init)(struct subprocess_info *info, struct cred 
*new),
+                         void (*cleanup)(struct subprocess_info *), void 
*data);
+
+extern int
+call_usermodehelper_exec(struct subprocess_info *info, int wait);
+
+extern struct ctl_table usermodehelper_table[];
+
+enum umh_disable_depth {
+       UMH_ENABLED = 0,
+       UMH_FREEZING,
+       UMH_DISABLED,
+};
+
+extern int __usermodehelper_disable(enum umh_disable_depth depth);
+extern void __usermodehelper_set_disable_depth(enum umh_disable_depth depth);
+
+static inline int usermodehelper_disable(void)
+{
+       return __usermodehelper_disable(UMH_DISABLED);
+}
+
+static inline void usermodehelper_enable(void)
+{
+       __usermodehelper_set_disable_depth(UMH_ENABLED);
+}
+
+extern int usermodehelper_read_trylock(void);
+extern long usermodehelper_read_lock_wait(long timeout);
+extern void usermodehelper_read_unlock(void);
+
+#endif /* __LINUX_UMH_H__ */
-- 
2.14.0

Reply via email to