projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw
[linux-2.6-block.git]
/
net
/
sunrpc
/
sunrpc_syms.c
diff --git
a/net/sunrpc/sunrpc_syms.c
b/net/sunrpc/sunrpc_syms.c
index 8adfc88e793a72308f72012bd30e447cd40dd6bf..3d6498af9adc1a1035005c735ee932de6488bee3 100644
(file)
--- a/
net/sunrpc/sunrpc_syms.c
+++ b/
net/sunrpc/sunrpc_syms.c
@@
-75,19
+75,20
@@
static struct pernet_operations sunrpc_net_ops = {
static int __init
init_sunrpc(void)
{
static int __init
init_sunrpc(void)
{
- int err = r
egister_rpc_pipefs
();
+ int err = r
pc_init_mempool
();
if (err)
goto out;
if (err)
goto out;
- err = rpc_init_mempool();
- if (err)
- goto out2;
err = rpcauth_init_module();
if (err)
err = rpcauth_init_module();
if (err)
- goto out
3
;
+ goto out
2
;
cache_initialize();
err = register_pernet_subsys(&sunrpc_net_ops);
cache_initialize();
err = register_pernet_subsys(&sunrpc_net_ops);
+ if (err)
+ goto out3;
+
+ err = register_rpc_pipefs();
if (err)
goto out4;
#ifdef RPC_DEBUG
if (err)
goto out4;
#ifdef RPC_DEBUG
@@
-98,11
+99,11
@@
init_sunrpc(void)
return 0;
out4:
return 0;
out4:
-
rpcauth_remove_module(
);
+
unregister_pernet_subsys(&sunrpc_net_ops
);
out3:
out3:
- rpc
_destroy_mempool
();
+ rpc
auth_remove_module
();
out2:
out2:
-
unregister_rpc_pipefs
();
+
rpc_destroy_mempool
();
out:
return err;
}
out:
return err;
}