diff options
Diffstat (limited to 'fs/cifs/cifsfs.c')
-rw-r--r-- | fs/cifs/cifsfs.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 8a2cf129e535..2a0c892959f4 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include "cifs_fs_sb.h" | 45 | #include "cifs_fs_sb.h" |
46 | #include <linux/mm.h> | 46 | #include <linux/mm.h> |
47 | #include <linux/key-type.h> | 47 | #include <linux/key-type.h> |
48 | #include "dns_resolve.h" | ||
49 | #include "cifs_spnego.h" | 48 | #include "cifs_spnego.h" |
50 | #include "fscache.h" | 49 | #include "fscache.h" |
51 | #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ | 50 | #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ |
@@ -934,22 +933,13 @@ init_cifs(void) | |||
934 | if (rc) | 933 | if (rc) |
935 | goto out_unregister_filesystem; | 934 | goto out_unregister_filesystem; |
936 | #endif | 935 | #endif |
937 | #ifdef CONFIG_CIFS_DFS_UPCALL | ||
938 | rc = cifs_init_dns_resolver(); | ||
939 | if (rc) | ||
940 | goto out_unregister_key_type; | ||
941 | #endif | ||
942 | rc = slow_work_register_user(THIS_MODULE); | 936 | rc = slow_work_register_user(THIS_MODULE); |
943 | if (rc) | 937 | if (rc) |
944 | goto out_unregister_resolver_key; | 938 | goto out_unregister_key_type; |
945 | 939 | ||
946 | return 0; | 940 | return 0; |
947 | 941 | ||
948 | out_unregister_resolver_key: | ||
949 | #ifdef CONFIG_CIFS_DFS_UPCALL | ||
950 | cifs_exit_dns_resolver(); | ||
951 | out_unregister_key_type: | 942 | out_unregister_key_type: |
952 | #endif | ||
953 | #ifdef CONFIG_CIFS_UPCALL | 943 | #ifdef CONFIG_CIFS_UPCALL |
954 | unregister_key_type(&cifs_spnego_key_type); | 944 | unregister_key_type(&cifs_spnego_key_type); |
955 | out_unregister_filesystem: | 945 | out_unregister_filesystem: |
@@ -976,7 +966,6 @@ exit_cifs(void) | |||
976 | cifs_fscache_unregister(); | 966 | cifs_fscache_unregister(); |
977 | #ifdef CONFIG_CIFS_DFS_UPCALL | 967 | #ifdef CONFIG_CIFS_DFS_UPCALL |
978 | cifs_dfs_release_automount_timer(); | 968 | cifs_dfs_release_automount_timer(); |
979 | cifs_exit_dns_resolver(); | ||
980 | #endif | 969 | #endif |
981 | #ifdef CONFIG_CIFS_UPCALL | 970 | #ifdef CONFIG_CIFS_UPCALL |
982 | unregister_key_type(&cifs_spnego_key_type); | 971 | unregister_key_type(&cifs_spnego_key_type); |