2010-08-03 05:03:08

by Michael Neuling

[permalink] [raw]
Subject: [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_exit_dns_resolver()

From: David Howells <[email protected]>

commit 51c20fcced5badee0e2021c6c89f44aa3cbd72aa

CIFS: Remove __exit mark from cifs_exit_dns_resolver()

Remove the __exit mark from cifs_exit_dns_resolver() as it's called by the
module init routine in case of error, and so may have been discarded during
linkage.

Signed-off-by: David Howells <[email protected]>
Acked-by: Jeff Layton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Signed-off-by: Michael Neuling <[email protected]>
cc: [email protected] (for 2.6.32)
---
This fixes a compile error on ppc64 allmodconfig with 2.6.32.17

fs/cifs/dns_resolve.h:28: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_exit_dns_resolver

Index: linux-2.6-ozlabs/fs/cifs/dns_resolve.c
===================================================================
--- linux-2.6-ozlabs.orig/fs/cifs/dns_resolve.c
+++ linux-2.6-ozlabs/fs/cifs/dns_resolve.c
@@ -226,7 +226,7 @@ failed_put_cred:
return ret;
}

-void __exit cifs_exit_dns_resolver(void)
+void cifs_exit_dns_resolver(void)
{
key_revoke(dns_resolver_cache->thread_keyring);
unregister_key_type(&key_type_dns_resolver);
Index: linux-2.6-ozlabs/fs/cifs/dns_resolve.h
===================================================================
--- linux-2.6-ozlabs.orig/fs/cifs/dns_resolve.h
+++ linux-2.6-ozlabs/fs/cifs/dns_resolve.h
@@ -25,7 +25,7 @@

#ifdef __KERNEL__
extern int __init cifs_init_dns_resolver(void);
-extern void __exit cifs_exit_dns_resolver(void);
+extern void cifs_exit_dns_resolver(void);
extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
#endif /* KERNEL */