UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: allocate export and expkey caches in per-net operations. 

Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Stanislav Kinsbursky 2012-04-11 15:13:35 +04:00 committed by J. Bruce Fields
parent e5f06f720e
commit 5717e01284
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
fs/nfsd/nfsctl.c
View File

@ -1137,7 +1137,28 @@ static int create_proc_exports_entry(void)
#endif #endif
int nfsd_net_id; int nfsd_net_id;
static __net_init int nfsd_init_net(struct net *net)
{
int retval;
retval = nfsd_export_init(net);
if (retval)
goto out_export_error;
return 0;
out_export_error:
return retval;
}
static __net_exit void nfsd_exit_net(struct net *net)
{
nfsd_export_shutdown(net);
}
static struct pernet_operations nfsd_net_ops = { static struct pernet_operations nfsd_net_ops = {
.init = nfsd_init_net,
.exit = nfsd_exit_net,
.id = &nfsd_net_id, .id = &nfsd_net_id,
.size = sizeof(struct nfsd_net), .size = sizeof(struct nfsd_net),
}; };
@ -1164,9 +1185,6 @@ static int __init init_nfsd(void)
retval = nfsd_reply_cache_init(); retval = nfsd_reply_cache_init();
if (retval) if (retval)
goto out_free_stat; goto out_free_stat;
retval = nfsd_export_init(&init_net);
if (retval)
goto out_free_cache;
nfsd_lockd_init(); /* lockd->nfsd callbacks */ nfsd_lockd_init(); /* lockd->nfsd callbacks */
retval = nfsd_idmap_init(); retval = nfsd_idmap_init();
if (retval) if (retval)
@ -1185,8 +1203,6 @@ out_free_idmap:
nfsd_idmap_shutdown(); nfsd_idmap_shutdown();
out_free_lockd: out_free_lockd:
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
nfsd_export_shutdown(&init_net);
out_free_cache:
nfsd_reply_cache_shutdown(); nfsd_reply_cache_shutdown();
out_free_stat: out_free_stat:
nfsd_stat_shutdown(); nfsd_stat_shutdown();
@ -1202,7 +1218,6 @@ out_unregister_notifier:
static void __exit exit_nfsd(void) static void __exit exit_nfsd(void)
{ {
nfsd_export_shutdown(&init_net);
nfsd_reply_cache_shutdown(); nfsd_reply_cache_shutdown();
remove_proc_entry("fs/nfs/exports", NULL); remove_proc_entry("fs/nfs/exports", NULL);
remove_proc_entry("fs/nfs", NULL); remove_proc_entry("fs/nfs", NULL);