iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: allocate id-to-name and name-to-id caches in per-net operations.

Browse Source 
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 17:33:05 +04:00 committed by J. Bruce Fields
parent 9e75a4dee0
commit f69adb2fe2
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfsd/nfsctl.c
View File

@ -1145,14 +1145,20 @@ static __net_init int nfsd_init_net(struct net *net)
retval = nfsd_export_init(net); retval = nfsd_export_init(net);
if (retval) if (retval)
goto out_export_error; goto out_export_error;
retval = nfsd_idmap_init(net);
if (retval)
goto out_idmap_error;
return 0; return 0;
out_idmap_error:
nfsd_export_shutdown(net);
out_export_error: out_export_error:
return retval; return retval;
} }
static __net_exit void nfsd_exit_net(struct net *net) static __net_exit void nfsd_exit_net(struct net *net)
{ {
nfsd_idmap_shutdown(net);
nfsd_export_shutdown(net); nfsd_export_shutdown(net);
} }
@ -1186,12 +1192,9 @@ static int __init init_nfsd(void)
if (retval) if (retval)
goto out_free_stat; goto out_free_stat;
nfsd_lockd_init(); /* lockd->nfsd callbacks */ nfsd_lockd_init(); /* lockd->nfsd callbacks */
retval = nfsd_idmap_init(&init_net);
if (retval)
goto out_free_lockd;
retval = create_proc_exports_entry(); retval = create_proc_exports_entry();
if (retval) if (retval)
goto out_free_idmap; goto out_free_lockd;
retval = register_filesystem(&nfsd_fs_type); retval = register_filesystem(&nfsd_fs_type);
if (retval) if (retval)
goto out_free_all; goto out_free_all;
@ -1199,8 +1202,6 @@ static int __init init_nfsd(void)
out_free_all: out_free_all:
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);
out_free_idmap:
nfsd_idmap_shutdown(&init_net);
out_free_lockd: out_free_lockd:
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
nfsd_reply_cache_shutdown(); nfsd_reply_cache_shutdown();
@ -1223,7 +1224,6 @@ static void __exit exit_nfsd(void)
remove_proc_entry("fs/nfs", NULL); remove_proc_entry("fs/nfs", NULL);
nfsd_stat_shutdown(); nfsd_stat_shutdown();
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
nfsd_idmap_shutdown(&init_net);
nfsd4_free_slabs(); nfsd4_free_slabs();
nfsd_fault_inject_cleanup(); nfsd_fault_inject_cleanup();
unregister_filesystem(&nfsd_fs_type); unregister_filesystem(&nfsd_fs_type);