[PATCH] CIFS: Remove __exit mark from cifs_exit_dns_resolver()

[PATCH] CIFS: Remove __exit mark from cifs_exit_dns_resolver()

[David Howells]

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 <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Acked-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---

 fs/cifs/dns_resolve.c |    2 +-
 fs/cifs/dns_resolve.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/dns_resolve.c b/fs/cifs/dns_resolve.c
index 49315cb..853a968 100644
--- a/fs/cifs/dns_resolve.c
+++ b/fs/cifs/dns_resolve.c
@@ -227,7 +227,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);
diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h
index 26b9eaa..5d7f291 100644
--- a/fs/cifs/dns_resolve.h
+++ b/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 */
 

Re: [PATCH] CIFS: Remove __exit mark from cifs_exit_dns_resolver()

[Uwe Kleine-König]

Hello,

On Fri, Jul 30, 2010 at 03:25:19PM +0100, David Howells wrote:
> 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.
From time to time I think about introducing something like
__init_or_exit that puts a function into .init.text if .exit.text is
discarded.  Is it worth the effort?

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Re: [PATCH] CIFS: Remove __exit mark from cifs_exit_dns_resolver()

[David Howells]

Uwe Kleine-König <u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote:

> From time to time I think about introducing something like
> __init_or_exit that puts a function into .init.text if .exit.text is
> discarded.  Is it worth the effort?

It might be worth including __exit stuff in __init if we would otherwise have
discarded it.  Otherwise there's liable to be a bunch of stuff that we could
otherwise discard left hanging around permanently.  But your suggestion would
work too.

David