[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <200903181442.16570.rusty@rustcorp.com.au>
Date: Wed, 18 Mar 2009 14:42:16 +1030
From: Rusty Russell <rusty@...tcorp.com.au>
To: Valdis.Kletnieks@...edu
Cc: Arjan van de Ven <arjan@...ux.intel.com>,
linux-kernel@...r.kernel.org
Subject: Re: linux-next - request_module_nowait() breaks iptables and iwl3945
On Wednesday 18 March 2009 08:57:15 Valdis.Kletnieks@...edu wrote:
> On Tue, 17 Mar 2009 16:27:58 +1030, Rusty Russell said:
> > On Monday 16 March 2009 12:28:04 Valdis.Kletnieks@...edu wrote:
> > > On recent linux-next, iptables and iwl3945 would fail to load
> > Please send .config; I can't reproduce this here.
>
> [root@...ing-police ~]# /etc/init.d/iptables start
> iptables: Applying firewall rules:
> iptables-restore v1.4.2: iptables-restore: unable to initialize table 'filter'
OK, I think this might fix it. It's already queued, but was labelled a mere
"cleanup".
Subject: kmod: use explicit names for waiting
Date: Mon, 16 Mar 2009 10:36:14 +0100
From: Jiri Slaby <jirislaby@...il.com>
Impact: cleanup
As call_usermodehelper accepts enum umh_wait as a wait parameter,
use constants from this enum instead of bool in __request_module.
Signed-off-by: Jiri Slaby <jirislaby@...il.com>
Cc: Arjan van de Ven <arjan@...ux.intel.com>
Signed-off-by: Rusty Russell <rusty@...tcorp.com.au>
---
kernel/kmod.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kernel/kmod.c b/kernel/kmod.c
index b2a53d0..b750675 100644
--- a/kernel/kmod.c
+++ b/kernel/kmod.c
@@ -109,7 +109,8 @@ int __request_module(bool wait, const char *fmt, ...)
return -ENOMEM;
}
- ret = call_usermodehelper(modprobe_path, argv, envp, wait);
+ ret = call_usermodehelper(modprobe_path, argv, envp,
+ wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
atomic_dec(&kmod_concurrent);
return ret;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists