diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-03-03 13:56:32 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2013-03-03 13:56:32 +0000 |
| commit | 88dd8d7ab34ca8c1f349decff8412e352a3af2d4 (patch) | |
| tree | 43766cf3c74c6ca0c0c1bdd6330e27dfba50ff21 /package/hotplug2/patches/150-force_fork_slow.patch | |
| parent | 14454994e1ff02937a9bea67685aa7e228119bec (diff) | |
hotplug2: merge worker related fixes into one patch
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35856 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/hotplug2/patches/150-force_fork_slow.patch')
| -rw-r--r-- | package/hotplug2/patches/150-force_fork_slow.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/package/hotplug2/patches/150-force_fork_slow.patch b/package/hotplug2/patches/150-force_fork_slow.patch deleted file mode 100644 index 47101f56b..000000000 --- a/package/hotplug2/patches/150-force_fork_slow.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/workers/worker_fork.c -+++ b/workers/worker_fork.c -@@ -396,7 +396,7 @@ static int worker_fork_process(void *in_ - worker_fork_update_children(ctx); - - child = NULL; -- for (i = 0; i < ctx->children_count; i++) { -+ for (i = 0; i < ctx->children_count && i < ctx->max_children; i++) { - if (ctx->children[i]->busy == 0) { - child = ctx->children[i]; - break; -@@ -426,7 +426,8 @@ static int worker_fork_process(void *in_ - /* - * We have to fork off a new child. - */ -- if (ctx->children_count < ctx->max_children) -+ if (ctx->children_count < ctx->max_children || -+ (ruleset_flags(&ctx->settings->rules, uevent) & FLAG_SLOW)) - child = worker_fork_spawn(ctx); - - for (i = 0; i < uevent->env_vars_c; i++) { |