Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5717e012 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

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



Signed-off-by: default avatarStanislav Kinsbursky <skinsbursky@parallels.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent e5f06f72

fs/nfsd/nfsctl.c

+21 −6
Original line number Diff line number Diff line
@@ -1137,7 +1137,28 @@ static int create_proc_exports_entry(void) 
#endif



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 = {

	.init = nfsd_init_net,

	.exit = nfsd_exit_net,

	.id   = &nfsd_net_id,

	.size = sizeof(struct nfsd_net),

};
@@ -1164,9 +1185,6 @@ static int __init init_nfsd(void) 
	retval = nfsd_reply_cache_init();

	if (retval)

		goto out_free_stat;

	retval = nfsd_export_init(&init_net);

	if (retval)

		goto out_free_cache;

	nfsd_lockd_init();	/* lockd->nfsd callbacks */

	retval = nfsd_idmap_init();

	if (retval)
@@ -1185,8 +1203,6 @@ out_free_idmap: 
	nfsd_idmap_shutdown();

out_free_lockd:

	nfsd_lockd_shutdown();

	nfsd_export_shutdown(&init_net);

out_free_cache:

	nfsd_reply_cache_shutdown();

out_free_stat:

	nfsd_stat_shutdown();
@@ -1202,7 +1218,6 @@ out_unregister_notifier: 


static void __exit exit_nfsd(void)

{

	nfsd_export_shutdown(&init_net);

	nfsd_reply_cache_shutdown();

	remove_proc_entry("fs/nfs/exports", NULL);

	remove_proc_entry("fs/nfs", NULL);