summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStanislav Kinsbursky <skinsbursky@parallels.com>2012-04-11 15:13:14 +0400
committerJ. Bruce Fields <bfields@redhat.com>2012-04-11 18:01:33 -0400
commitb89109bef4a6a4a8ab5788778ee0addca0787870 (patch)
treed42ef77b42075c474e1d8f4f4b95a1d5f03c564f
parente3f70eadb7dddfb5a2bb9afff7abfc6ee17a29d0 (diff)
downloadop-kernel-dev-b89109bef4a6a4a8ab5788778ee0addca0787870.zip
op-kernel-dev-b89109bef4a6a4a8ab5788778ee0addca0787870.tar.gz
nfsd: pass network context to export caches init/shutdown routines
These functions will be called from per-net operations. Signed-off-by: Stanislav Kinsbursky <skinsbursky@parallels.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
-rw-r--r--fs/nfsd/export.c20
-rw-r--r--fs/nfsd/nfsctl.c6
-rw-r--r--include/linux/nfsd/export.h4
3 files changed, 15 insertions, 15 deletions
diff --git a/fs/nfsd/export.c b/fs/nfsd/export.c
index 84723bc..6453669 100644
--- a/fs/nfsd/export.c
+++ b/fs/nfsd/export.c
@@ -1228,17 +1228,17 @@ const struct seq_operations nfs_exports_op = {
* Initialize the exports module.
*/
int
-nfsd_export_init(void)
+nfsd_export_init(struct net *net)
{
int rv;
- dprintk("nfsd: initializing export module.\n");
+ dprintk("nfsd: initializing export module (net: %p).\n", net);
- rv = cache_register_net(&svc_export_cache, &init_net);
+ rv = cache_register_net(&svc_export_cache, net);
if (rv)
return rv;
- rv = cache_register_net(&svc_expkey_cache, &init_net);
+ rv = cache_register_net(&svc_expkey_cache, net);
if (rv)
- cache_unregister_net(&svc_export_cache, &init_net);
+ cache_unregister_net(&svc_export_cache, net);
return rv;
}
@@ -1257,14 +1257,14 @@ nfsd_export_flush(void)
* Shutdown the exports module.
*/
void
-nfsd_export_shutdown(void)
+nfsd_export_shutdown(struct net *net)
{
- dprintk("nfsd: shutting down export module.\n");
+ dprintk("nfsd: shutting down export module (net: %p).\n", net);
- cache_unregister_net(&svc_expkey_cache, &init_net);
- cache_unregister_net(&svc_export_cache, &init_net);
+ cache_unregister_net(&svc_expkey_cache, net);
+ cache_unregister_net(&svc_export_cache, net);
svcauth_unix_purge();
- dprintk("nfsd: export shutdown complete.\n");
+ dprintk("nfsd: export shutdown complete (net: %p).\n", net);
}
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index ae19293..bc76f8e 100644
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -1163,7 +1163,7 @@ static int __init init_nfsd(void)
retval = nfsd_reply_cache_init();
if (retval)
goto out_free_stat;
- retval = nfsd_export_init();
+ retval = nfsd_export_init(&init_net);
if (retval)
goto out_free_cache;
nfsd_lockd_init(); /* lockd->nfsd callbacks */
@@ -1184,7 +1184,7 @@ out_free_idmap:
nfsd_idmap_shutdown();
out_free_lockd:
nfsd_lockd_shutdown();
- nfsd_export_shutdown();
+ nfsd_export_shutdown(&init_net);
out_free_cache:
nfsd_reply_cache_shutdown();
out_free_stat:
@@ -1201,7 +1201,7 @@ out_unregister_notifier:
static void __exit exit_nfsd(void)
{
- nfsd_export_shutdown();
+ nfsd_export_shutdown(&init_net);
nfsd_reply_cache_shutdown();
remove_proc_entry("fs/nfs/exports", NULL);
remove_proc_entry("fs/nfs", NULL);
diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h
index 485c2af..375096c 100644
--- a/include/linux/nfsd/export.h
+++ b/include/linux/nfsd/export.h
@@ -130,8 +130,8 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
/*
* Function declarations
*/
-int nfsd_export_init(void);
-void nfsd_export_shutdown(void);
+int nfsd_export_init(struct net *);
+void nfsd_export_shutdown(struct net *);
void nfsd_export_flush(void);
struct svc_export * rqst_exp_get_by_name(struct svc_rqst *,
struct path *);
OpenPOWER on IntegriCloud