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>

diff --git a/fs/nfsd/idmap.h b/fs/nfsd/idmap.h
index 2f3be1321534375b65cac5705806edda29c6088d..9d513efc01baad65a0807284082315c3d5a68206 100644 (file)
--- a/fs/nfsd/idmap.h
+++ b/fs/nfsd/idmap.h
@@ -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

diff --git a/fs/nfsd/nfs4idmap.c b/fs/nfsd/nfs4idmap.c
index 2ff44708ea9696ff0f7a8787506a8413f9ca717c..d37405f7000a18474bec2892d106c658f331940b 100644 (file)
--- a/fs/nfsd/nfs4idmap.c
+++ b/fs/nfsd/nfs4idmap.c
@@ -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

diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c
index 08cd87a9fb4040cea3e98bf28d46c3bd8ebe8d27..d6e8b85c6b7f951988926c8b5097635011f21317 100644 (file)
--- a/fs/nfsd/nfsctl.c
+++ b/fs/nfsd/nfsctl.c
@@ -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);