Chuck Ebbert 0bf6d25
From: Chuck Ebbert <cebbert@redhat.com>
Chuck Ebbert 0bf6d25
Chuck Ebbert 0bf6d25
CIFS: Fix DNS resolver build
Chuck Ebbert 0bf6d25
Chuck Ebbert 0bf6d25
In file included from fs/cifs/dns_resolve.c:29:
Chuck Ebbert 0bf6d25
fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
Chuck Ebbert 0bf6d25
Chuck Ebbert 0bf6d25
Just remove the __init and __exit attributes from the init and exit
Chuck Ebbert 0bf6d25
functions. __exit was removed upstream in 51c20fcced5badee0e2021c6c89f44aa3cbd72aa
Chuck Ebbert 0bf6d25
anyway, and there's no point trying to save every byte by fixing
Chuck Ebbert 0bf6d25
this properly.
Chuck Ebbert 0bf6d25
Chuck Ebbert 0bf6d25
Signed-Off-By: Chuck Ebbert <cebbert@redhat.com>
Chuck Ebbert 0bf6d25
Chuck Ebbert 0bf6d25
--- a/fs/cifs/dns_resolve.c
Chuck Ebbert 0bf6d25
+++ b/fs/cifs/dns_resolve.c
Chuck Ebbert 0bf6d25
@@ -176,7 +176,7 @@ out:
Chuck Ebbert 0bf6d25
 	return rc;
Chuck Ebbert 0bf6d25
 }
Chuck Ebbert 0bf6d25
 
Chuck Ebbert 0bf6d25
-int __init cifs_init_dns_resolver(void)
Chuck Ebbert 0bf6d25
+int cifs_init_dns_resolver(void)
Chuck Ebbert 0bf6d25
 {
Chuck Ebbert 0bf6d25
 	struct cred *cred;
Chuck Ebbert 0bf6d25
 	struct key *keyring;
Chuck Ebbert 0bf6d25
@@ -226,7 +226,7 @@ failed_put_cred:
Chuck Ebbert 0bf6d25
 	return ret;
Chuck Ebbert 0bf6d25
 }
Chuck Ebbert 0bf6d25
 
Chuck Ebbert 0bf6d25
-void __exit cifs_exit_dns_resolver(void)
Chuck Ebbert 0bf6d25
+void cifs_exit_dns_resolver(void)
Chuck Ebbert 0bf6d25
 {
Chuck Ebbert 0bf6d25
 	key_revoke(dns_resolver_cache->thread_keyring);
Chuck Ebbert 0bf6d25
 	unregister_key_type(&key_type_dns_resolver);
Chuck Ebbert 0bf6d25
--- a/fs/cifs/dns_resolve.h
Chuck Ebbert 0bf6d25
+++ b/fs/cifs/dns_resolve.h
Chuck Ebbert 0bf6d25
@@ -24,8 +24,8 @@
Chuck Ebbert 0bf6d25
 #define _DNS_RESOLVE_H
Chuck Ebbert 0bf6d25
 
Chuck Ebbert 0bf6d25
 #ifdef __KERNEL__
Chuck Ebbert 0bf6d25
-extern int __init cifs_init_dns_resolver(void);
Chuck Ebbert 0bf6d25
-extern void __exit cifs_exit_dns_resolver(void);
Chuck Ebbert 0bf6d25
+extern int cifs_init_dns_resolver(void);
Chuck Ebbert 0bf6d25
+extern void cifs_exit_dns_resolver(void);
Chuck Ebbert 0bf6d25
 extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
Chuck Ebbert 0bf6d25
 #endif /* KERNEL */
Chuck Ebbert 0bf6d25