From: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
To: stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_exit_dns_resolver()
Date: Tue, 03 Aug 2010 15:03:03 +1000 [thread overview]
Message-ID: <19789.1280811783@neuling.org> (raw)
From: David Howells <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
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 <dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Acked-by: Jeff Layton <jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Signed-off-by: Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Signed-off-by: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
cc: stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org (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 */
WARNING: multiple messages have this Message-ID (diff)
From: Michael Neuling <mikey@neuling.org>
To: stable@kernel.org
Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Jeff Layton <jlayton@redhat.com>
Subject: [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_exit_dns_resolver()
Date: Tue, 03 Aug 2010 15:03:03 +1000 [thread overview]
Message-ID: <19789.1280811783@neuling.org> (raw)
From: David Howells <dhowells@redhat.com>
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 <dhowells@redhat.com>
Acked-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Michael Neuling <mikey@neuling.org>
cc: stable@kernel.org (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 */
next reply other threads:[~2010-08-03 5:03 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-03 5:03 Michael Neuling [this message]
2010-08-03 5:03 ` [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_exit_dns_resolver() Michael Neuling
2010-08-03 5:03 ` [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_init_dns_resolver() header Michael Neuling
2010-08-03 5:03 ` Michael Neuling
[not found] ` <19826.1280811821-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
2010-08-03 21:40 ` David Howells
2010-08-03 21:40 ` David Howells
[not found] ` <12482.1280871625-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2010-08-03 22:32 ` [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition Michael Neuling
2010-08-03 22:32 ` Michael Neuling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=19789.1280811783@neuling.org \
--to=mikey-/owaoxkjmzzafugrpc6u6w@public.gmane.org \
--cc=dhowells-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=jlayton-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=linux-cifs-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.