diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-04-24 09:59:25 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-24 09:59:25 +0200 |
| commit | 3d36696024499aef19dbf24a781e91a24fbbe4af (patch) | |
| tree | 2d999dfee2897123f6fb16e2a75327ac8db2020d /net/unix | |
| parent | [RTNETLINK]: Fix bogus ASSERT_RTNL warning (diff) | |
| download | linux-3d36696024499aef19dbf24a781e91a24fbbe4af.tar.xz linux-3d36696024499aef19dbf24a781e91a24fbbe4af.zip | |
[AF_UNIX] Initialise UNIX sockets before general device initcalls
When drivers call request_module(), it tries to do something with UNIX
sockets and triggers a 'runaway loop modprobe net-pf-1' warning. Avoid
this by initialising AF_UNIX support earlier.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix')
| -rw-r--r-- | net/unix/af_unix.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 2851d0d15048..63ed69ffad99 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -2193,7 +2193,11 @@ static void __exit af_unix_exit(void) unregister_pernet_subsys(&unix_net_ops); } -module_init(af_unix_init); +/* Earlier than device_initcall() so that other drivers invoking + request_module() don't end up in a loop when modprobe tries + to use a UNIX socket. But later than subsys_initcall() because + we depend on stuff initialised there */ +fs_initcall(af_unix_init); module_exit(af_unix_exit); MODULE_LICENSE("GPL"); |