diff options
author | Felix Fietkau <nbd@openwrt.org> | 2013-03-03 13:56:32 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2013-03-03 13:56:32 +0000 |
commit | 51e008284ddb8be391ccdc1820a8d99e4303adc9 (patch) | |
tree | 1ed08eeeec7c3e70e3f40853c86b27a3a057b5a1 /package/hotplug2/patches/150-force_fork_slow.patch | |
parent | 4491da2bd48379eb166f301bbc40618439e10205 (diff) | |
download | upstream-51e008284ddb8be391ccdc1820a8d99e4303adc9.tar.gz upstream-51e008284ddb8be391ccdc1820a8d99e4303adc9.tar.bz2 upstream-51e008284ddb8be391ccdc1820a8d99e4303adc9.zip |
hotplug2: merge worker related fixes into one patch
SVN-Revision: 35856
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 47101f56b9..0000000000 --- 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++) { |