NFSv4: Move the DNS resolver into the NFSv4 module

[mirror_ubuntu-artful-kernel.git] / fs / nfs / nfs4super.c

diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c
index a5e1a3026d489240cb7a44ae87eec07df019ce3a..5dbe2d269210f000132547d3c21daa33e7e1b224 100644 (file)
--- a/fs/nfs/nfs4super.c
+++ b/fs/nfs/nfs4super.c
@@ -9,6 +9,7 @@
 #include "delegation.h"
 #include "internal.h"
 #include "nfs4_fs.h"
+#include "dns_resolve.h"
 #include "pnfs.h"
 #include "nfs.h"
 
@@ -331,18 +332,24 @@ static int __init init_nfs_v4(void)
 {
        int err;
 
-       err = nfs_idmap_init();
+       err = nfs_dns_resolver_init();
        if (err)
                goto out;
 
-       err = nfs4_register_sysctl();
+       err = nfs_idmap_init();
        if (err)
                goto out1;
 
+       err = nfs4_register_sysctl();
+       if (err)
+               goto out2;
+
        register_nfs_version(&nfs_v4);
        return 0;
-out1:
+out2:
        nfs_idmap_quit();
+out1:
+       nfs_dns_resolver_destroy();
 out:
        return err;
 }
@@ -352,6 +359,7 @@ static void __exit exit_nfs_v4(void)
        unregister_nfs_version(&nfs_v4);
        nfs4_unregister_sysctl();
        nfs_idmap_quit();
+       nfs_dns_resolver_destroy();
 }
 
 MODULE_LICENSE("GPL");