dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

nfsd: pass network context to idmap init/exit functions 

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 17:32:44 +04:00 committed by J. Bruce Fields
parent 5717e01284
commit 43ec1a20bf
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs/nfsd/idmap.h
View File

@ -42,14 +42,14 @@
#define IDMAP_NAMESZ 128
#ifdef CONFIG_NFSD_V4
int nfsd_idmap_init(void);
void nfsd_idmap_shutdown(void);
int nfsd_idmap_init(struct net *);
void nfsd_idmap_shutdown(struct net *);
#else
static inline int nfsd_idmap_init(void)
static inline int nfsd_idmap_init(struct net *net)
{
return 0;
}
static inline void nfsd_idmap_shutdown(void)
static inline void nfsd_idmap_shutdown(struct net *net)
{
}
#endif

14
fs/nfsd/nfs4idmap.c
View File

@ -469,24 +469,24 @@ nametoid_update(struct cache_detail *cd, struct ent *new, struct ent *old)
*/
int
nfsd_idmap_init(void)
nfsd_idmap_init(struct net *net)
{
int rv;
rv = cache_register_net(&idtoname_cache, &init_net);
rv = cache_register_net(&idtoname_cache, net);
if (rv)
return rv;
rv = cache_register_net(&nametoid_cache, &init_net);
rv = cache_register_net(&nametoid_cache, net);
if (rv)
cache_unregister_net(&idtoname_cache, &init_net);
cache_unregister_net(&idtoname_cache, net);
return rv;
}
void
nfsd_idmap_shutdown(void)
nfsd_idmap_shutdown(struct net *net)
{
cache_unregister_net(&idtoname_cache, &init_net);
cache_unregister_net(&nametoid_cache, &init_net);
cache_unregister_net(&idtoname_cache, net);
cache_unregister_net(&nametoid_cache, net);
}
static int

6
fs/nfsd/nfsctl.c
View File

@ -1186,7 +1186,7 @@ static int __init init_nfsd(void)
if (retval)
goto out_free_stat;
nfsd_lockd_init(); /* lockd->nfsd callbacks */
retval = nfsd_idmap_init();
retval = nfsd_idmap_init(&init_net);
if (retval)
goto out_free_lockd;
retval = create_proc_exports_entry();
@ -1200,7 +1200,7 @@ out_free_all:
remove_proc_entry("fs/nfs/exports", NULL);
remove_proc_entry("fs/nfs", NULL);
out_free_idmap:
nfsd_idmap_shutdown();
nfsd_idmap_shutdown(&init_net);
out_free_lockd:
nfsd_lockd_shutdown();
nfsd_reply_cache_shutdown();
@ -1223,7 +1223,7 @@ static void __exit exit_nfsd(void)
remove_proc_entry("fs/nfs", NULL);
nfsd_stat_shutdown();
nfsd_lockd_shutdown();
nfsd_idmap_shutdown();
nfsd_idmap_shutdown(&init_net);
nfsd4_free_slabs();
nfsd_fault_inject_cleanup();
unregister_filesystem(&nfsd_fs_type);