Commit 43ec1a20 authored by Stanislav Kinsbursky's avatar Stanislav Kinsbursky Committed by J. Bruce Fields
Browse files

nfsd: pass network context to idmap init/exit functions 



These functions will be called from per-net operations.

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

fs/nfsd/idmap.h

+4 −4
Original line number Diff line number Diff line
@@ -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

fs/nfsd/nfs4idmap.c

+7 −7
Original line number Diff line number Diff line
@@ -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

fs/nfsd/nfsctl.c

+3 −3
Original line number Diff line number Diff line
@@ -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 @@ static int __init init_nfsd(void) 
	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);