From 1ca5d1cb4e76bb8a6c9c28f5f416264caba89a59 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Thu, 6 Jan 2011 18:42:23 +0000 Subject: UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it Signed-off-by: Andy Whitcroft --- include/linux/init.h | 2 -- include/linux/kmod.h | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/linux/init.h b/include/linux/init.h index ad021e87d5a..bc7379f6625 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -224,8 +224,6 @@ extern bool initcall_debug; static initcall_t __initcall_##fn \ __used __section(.security_initcall.init) = fn -extern struct list_head populate_rootfs_domain; - struct obs_kernel_param { const char *str; int (*setup_func)(char *); diff --git a/include/linux/kmod.h b/include/linux/kmod.h index dd99c329e16..37f497b8912 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -83,6 +83,8 @@ int call_usermodehelper_exec(struct subprocess_info *info, int wait); to call call_usermodehelper_exec */ void call_usermodehelper_freeinfo(struct subprocess_info *info); +void populate_rootfs_wait(void); + static inline int call_usermodehelper_fns(char *path, char **argv, char **envp, int wait, int (*init)(struct subprocess_info *info, struct cred *new), @@ -91,6 +93,8 @@ call_usermodehelper_fns(char *path, char **argv, char **envp, int wait, struct subprocess_info *info; gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; + populate_rootfs_wait(); + info = call_usermodehelper_setup(path, argv, envp, gfp_mask); if (info == NULL) -- cgit v1.2.3