* [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_exit_dns_resolver()
@ 2010-08-03 5:03 ` Michael Neuling
0 siblings, 0 replies; 8+ messages in thread
From: Michael Neuling @ 2010-08-03 5:03 UTC (permalink / raw)
To: stable-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, David Howells, Jeff Layton
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 */
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_exit_dns_resolver()
@ 2010-08-03 5:03 ` Michael Neuling
0 siblings, 0 replies; 8+ messages in thread
From: Michael Neuling @ 2010-08-03 5:03 UTC (permalink / raw)
To: stable; +Cc: linux-cifs, linux-kernel, David Howells, Jeff Layton
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 */
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_init_dns_resolver() header
2010-08-03 5:03 ` Michael Neuling
@ 2010-08-03 5:03 ` Michael Neuling
-1 siblings, 0 replies; 8+ messages in thread
From: Michael Neuling @ 2010-08-03 5:03 UTC (permalink / raw)
To: stable-DgEjT+Ai2ygdnm+yROfE0A
Cc: linux-cifs-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, David Howells, Jeff Layton
An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
This removes the __init from cifs_init_dns_resolver()
Signed-off-by: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
cc: stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org (for 2.6.32)
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
@@ -24,7 +24,7 @@
#define _DNS_RESOLVE_H
#ifdef __KERNEL__
-extern int __init cifs_init_dns_resolver(void);
+extern int cifs_init_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 */
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_init_dns_resolver() header
@ 2010-08-03 5:03 ` Michael Neuling
0 siblings, 0 replies; 8+ messages in thread
From: Michael Neuling @ 2010-08-03 5:03 UTC (permalink / raw)
To: stable; +Cc: linux-cifs, linux-kernel, David Howells, Jeff Layton
An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
This removes the __init from cifs_init_dns_resolver()
Signed-off-by: Michael Neuling <mikey@neuling.org>
cc: stable@kernel.org (for 2.6.32)
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
@@ -24,7 +24,7 @@
#define _DNS_RESOLVE_H
#ifdef __KERNEL__
-extern int __init cifs_init_dns_resolver(void);
+extern int cifs_init_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 */
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <19826.1280811821-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>]
* Re: [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_init_dns_resolver() header
2010-08-03 5:03 ` Michael Neuling
@ 2010-08-03 21:40 ` David Howells
-1 siblings, 0 replies; 8+ messages in thread
From: David Howells @ 2010-08-03 21:40 UTC (permalink / raw)
To: Michael Neuling
Cc: dhowells-H+wXaHxf7aLQT0dZR+AlfA, stable-DgEjT+Ai2ygdnm+yROfE0A,
linux-cifs-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Jeff Layton
Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org> wrote:
> An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
>
> fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
>
> This removes the __init from cifs_init_dns_resolver()
That's not really a good idea as the assembler may choose different pieces of
assembly to do variable references and jumps, depending on the section
information.
A better fix is to add:
#include <linux/module.h>
to the header file.
David
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2.6.32/stable] CIFS: Remove __exit mark from cifs_init_dns_resolver() header
@ 2010-08-03 21:40 ` David Howells
0 siblings, 0 replies; 8+ messages in thread
From: David Howells @ 2010-08-03 21:40 UTC (permalink / raw)
To: Michael Neuling; +Cc: dhowells, stable, linux-cifs, linux-kernel, Jeff Layton
Michael Neuling <mikey@neuling.org> wrote:
> An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
>
> fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
>
> This removes the __init from cifs_init_dns_resolver()
That's not really a good idea as the assembler may choose different pieces of
assembly to do variable references and jumps, depending on the section
information.
A better fix is to add:
#include <linux/module.h>
to the header file.
David
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <12482.1280871625-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]
* [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
2010-08-03 21:40 ` David Howells
@ 2010-08-03 22:32 ` Michael Neuling
-1 siblings, 0 replies; 8+ messages in thread
From: Michael Neuling @ 2010-08-03 22:32 UTC (permalink / raw)
To: David Howells
Cc: stable-DgEjT+Ai2ygdnm+yROfE0A, linux-cifs-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, Jeff Layton
In message <12482.1280871625-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> you wrote:
> Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org> wrote:
>
> > An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
> >
> > fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attrib
ute__' before 'cifs_init_dns_resolver'
> >
> > This removes the __init from cifs_init_dns_resolver()
>
> That's not really a good idea as the assembler may choose different pieces of
> assembly to do variable references and jumps, depending on the section
> information.
>
> A better fix is to add:
>
> #include <linux/module.h>
>
> to the header file.
Ok, new patch below.
CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
This adds the correct header file to fix this.
Signed-off-by: Michael Neuling <mikey-/owAOxkjmzZAfugRpC6u6w@public.gmane.org>
cc: stable-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org (for 2.6.32)
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
@@ -24,6 +24,8 @@
#define _DNS_RESOLVE_H
#ifdef __KERNEL__
+#include <linux/module.h>
+
extern int __init cifs_init_dns_resolver(void);
extern void cifs_exit_dns_resolver(void);
extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2.6.32/stable] CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
@ 2010-08-03 22:32 ` Michael Neuling
0 siblings, 0 replies; 8+ messages in thread
From: Michael Neuling @ 2010-08-03 22:32 UTC (permalink / raw)
To: David Howells; +Cc: stable, linux-cifs, linux-kernel, Jeff Layton
In message <12482.1280871625@redhat.com> you wrote:
> Michael Neuling <mikey@neuling.org> wrote:
>
> > An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
> >
> > fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attrib
ute__' before 'cifs_init_dns_resolver'
> >
> > This removes the __init from cifs_init_dns_resolver()
>
> That's not really a good idea as the assembler may choose different pieces of
> assembly to do variable references and jumps, depending on the section
> information.
>
> A better fix is to add:
>
> #include <linux/module.h>
>
> to the header file.
Ok, new patch below.
CIFS: Fix compile error with __init in cifs_init_dns_resolver() definition
An allmodconfig compile on ppc64 with 2.6.32.17 currently gives this error
fs/cifs/dns_resolve.h:27: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'cifs_init_dns_resolver'
This adds the correct header file to fix this.
Signed-off-by: Michael Neuling <mikey@neuling.org>
cc: stable@kernel.org (for 2.6.32)
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
@@ -24,6 +24,8 @@
#define _DNS_RESOLVE_H
#ifdef __KERNEL__
+#include <linux/module.h>
+
extern int __init cifs_init_dns_resolver(void);
extern void cifs_exit_dns_resolver(void);
extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr);
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2010-08-03 22:32 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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 ` 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
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.