diff options
| author | Tim Gardner <tim.gardner@canonical.com> | 2012-10-16 11:00:37 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-11-14 18:19:38 -0700 |
| commit | 5c70c6a922604ea9dc569d33c56bdb5e72331755 (patch) | |
| tree | 8b84b99cd27a1ae38064ccca98284f8848406935 | |
| parent | 857f83bf6449f644fdd098e203d7dbf6c60f97cb (diff) | |
Revert "UBUNTU: SAUCE: ensure root is ready before running usermodehelpers in it"
This reverts commit ea52e7ed17f85326b36138a949221caa625c9a5d.
| -rw-r--r-- | include/linux/init.h | 2 | ||||
| -rw-r--r-- | include/linux/kmod.h | 2 | ||||
| -rw-r--r-- | init/initramfs.c | 7 | ||||
| -rw-r--r-- | init/main.c | 2 | ||||
| -rw-r--r-- | kernel/kmod.c | 2 |
5 files changed, 3 insertions, 12 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 8326ee50b3b..ef222c37f18 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -236,6 +236,8 @@ 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 6f571b1be39..5398d580707 100644 --- a/include/linux/kmod.h +++ b/include/linux/kmod.h @@ -71,8 +71,6 @@ 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); -void populate_rootfs_wait(void); - static inline int call_usermodehelper(char *path, char **argv, char **envp, int wait) { diff --git a/init/initramfs.c b/init/initramfs.c index c5a41234666..1ae8873570c 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -19,7 +19,6 @@ #include <linux/syscalls.h> #include <linux/utime.h> #include <linux/async.h> -#include <linux/export.h> static __initdata char *message; static void __init error(char *x) @@ -583,12 +582,6 @@ static void __init clean_rootfs(void) LIST_HEAD(populate_rootfs_domain); -void populate_rootfs_wait(void) -{ - async_synchronize_full_domain(&populate_rootfs_domain); -} -EXPORT_SYMBOL(populate_rootfs_wait); - static void __init async_populate_rootfs(void) { char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size); diff --git a/init/main.c b/init/main.c index b3e7e7b283d..ccd91c5ba7a 100644 --- a/init/main.c +++ b/init/main.c @@ -904,7 +904,7 @@ static void __init kernel_init_freeable(void) * We need to ensure that the filesystem is ready by this point, wait for * async_populate_rootfs to complete. */ - populate_rootfs_wait(); + async_synchronize_full_domain(&populate_rootfs_domain); /* * check if there is an early userspace init. If yes, let it do all diff --git a/kernel/kmod.c b/kernel/kmod.c index 130fb9254a4..1c317e38683 100644 --- a/kernel/kmod.c +++ b/kernel/kmod.c @@ -621,8 +621,6 @@ int call_usermodehelper_fns( 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) |