MAINTAINERS: update Laurent Pinchart email

[mv-sheeva.git] / fs / cifs / cifsfs.c

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 8a2cf129e535a21a8cd8bf7bc9116e2bbbd025da..a5ed10c9afef09828c84cdc8434cc65f3b1bcbc8 100644 (file)
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -45,7 +45,6 @@
 #include "cifs_fs_sb.h"
 #include <linux/mm.h>
 #include <linux/key-type.h>
-#include "dns_resolve.h"
 #include "cifs_spnego.h"
 #include "fscache.h"
 #define CIFS_MAGIC_NUMBER 0xFF534D42   /* the first four bytes of SMB PDUs */
@@ -934,27 +933,13 @@ init_cifs(void)
        if (rc)
                goto out_unregister_filesystem;
 #endif
-#ifdef CONFIG_CIFS_DFS_UPCALL
-       rc = cifs_init_dns_resolver();
-       if (rc)
-               goto out_unregister_key_type;
-#endif
-       rc = slow_work_register_user(THIS_MODULE);
-       if (rc)
-               goto out_unregister_resolver_key;
 
        return 0;
 
- out_unregister_resolver_key:
-#ifdef CONFIG_CIFS_DFS_UPCALL
-       cifs_exit_dns_resolver();
- out_unregister_key_type:
-#endif
 #ifdef CONFIG_CIFS_UPCALL
-       unregister_key_type(&cifs_spnego_key_type);
  out_unregister_filesystem:
-#endif
        unregister_filesystem(&cifs_fs_type);
+#endif
  out_destroy_request_bufs:
        cifs_destroy_request_bufs();
  out_destroy_mids:
@@ -976,7 +961,6 @@ exit_cifs(void)
        cifs_fscache_unregister();
 #ifdef CONFIG_CIFS_DFS_UPCALL
        cifs_dfs_release_automount_timer();
-       cifs_exit_dns_resolver();
 #endif
 #ifdef CONFIG_CIFS_UPCALL
        unregister_key_type(&cifs_spnego_key_type);