android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nfsd: pass network context to export caches init/shutdown routines

Browse Source 
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>
This commit is contained in:
Stanislav Kinsbursky 2012-04-11 15:13:14 +04:00 committed by J. Bruce Fields
parent e3f70eadb7
commit b89109bef4
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/nfsd/export.c
View File

@ -1228,17 +1228,17 @@ const struct seq_operations nfs_exports_op = {
* Initialize the exports module. * Initialize the exports module.
*/ */
int int
nfsd_export_init(void) nfsd_export_init(struct net *net)
{ {
int rv; 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) if (rv)
return rv; return rv;
rv = cache_register_net(&svc_expkey_cache, &init_net); rv = cache_register_net(&svc_expkey_cache, net);
if (rv) if (rv)
cache_unregister_net(&svc_export_cache, &init_net); cache_unregister_net(&svc_export_cache, net);
return rv; return rv;
} }
@ -1257,14 +1257,14 @@ nfsd_export_flush(void)
* Shutdown the exports module. * Shutdown the exports module.
*/ */
void 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_expkey_cache, net);
cache_unregister_net(&svc_export_cache, &init_net); cache_unregister_net(&svc_export_cache, net);
svcauth_unix_purge(); svcauth_unix_purge();
dprintk("nfsd: export shutdown complete.\n"); dprintk("nfsd: export shutdown complete (net: %p).\n", net);
} }

6
fs/nfsd/nfsctl.c
View File

@ -1163,7 +1163,7 @@ 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(); retval = nfsd_export_init(&init_net);
if (retval) if (retval)
goto out_free_cache; goto out_free_cache;
nfsd_lockd_init(); /* lockd->nfsd callbacks */ nfsd_lockd_init(); /* lockd->nfsd callbacks */
@ -1184,7 +1184,7 @@ static int __init init_nfsd(void)
nfsd_idmap_shutdown(); nfsd_idmap_shutdown();
out_free_lockd: out_free_lockd:
nfsd_lockd_shutdown(); nfsd_lockd_shutdown();
nfsd_export_shutdown(); nfsd_export_shutdown(&init_net);
out_free_cache: out_free_cache:
nfsd_reply_cache_shutdown(); nfsd_reply_cache_shutdown();
out_free_stat: out_free_stat:
@ -1201,7 +1201,7 @@ static int __init init_nfsd(void)
static void __exit exit_nfsd(void) static void __exit exit_nfsd(void)
{ {
nfsd_export_shutdown(); 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);

4
include/linux/nfsd/export.h
View File

@ -130,8 +130,8 @@ __be32 check_nfsd_access(struct svc_export *exp, struct svc_rqst *rqstp);
/* /*
* Function declarations * Function declarations
*/ */
int nfsd_export_init(void); int nfsd_export_init(struct net *);
void nfsd_export_shutdown(void); void nfsd_export_shutdown(struct net *);
void nfsd_export_flush(void); void nfsd_export_flush(void);
struct svc_export * rqst_exp_get_by_name(struct svc_rqst *, struct svc_export * rqst_exp_get_by_name(struct svc_rqst *,
struct path *); struct path *);