* [patch] fix static linking of NFS
@ 2006-06-27 9:29 Jes Sorensen
2006-06-27 16:33 ` Trond Myklebust
0 siblings, 1 reply; 7+ messages in thread
From: Jes Sorensen @ 2006-06-27 9:29 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Andrew Morton, linux-kernel, David Brownell
Hi,
This patch solved the problem where certain functions in the NFS code
goes missing due to the __exit section being discarded for static
links.
I saw one other version of this patch from David Brownell, but it had
clutter left on the lines where the __exit should simply be removed.
Cheers,
Jes
Remove __exit declarations from functions called from __init code to
avoid link errors when the __exit section is discarded, eg NFS is
linked statically into the kernel.
Signed-off-by: Jes Sorensen <jes@sgi.com>
---
fs/nfs/direct.c | 2 +-
fs/nfs/inode.c | 2 +-
fs/nfs/pagelist.c | 2 +-
fs/nfs/read.c | 2 +-
fs/nfs/write.c | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
Index: linux-2.6/fs/nfs/direct.c
===================================================================
--- linux-2.6.orig/fs/nfs/direct.c
+++ linux-2.6/fs/nfs/direct.c
@@ -909,7 +909,7 @@ int __init nfs_init_directcache(void)
* nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures
*
*/
-void __exit nfs_destroy_directcache(void)
+void nfs_destroy_directcache(void)
{
if (kmem_cache_destroy(nfs_direct_cachep))
printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");
Index: linux-2.6/fs/nfs/inode.c
===================================================================
--- linux-2.6.orig/fs/nfs/inode.c
+++ linux-2.6/fs/nfs/inode.c
@@ -1132,7 +1132,7 @@ static int __init nfs_init_inodecache(vo
return 0;
}
-static void __exit nfs_destroy_inodecache(void)
+static void nfs_destroy_inodecache(void)
{
if (kmem_cache_destroy(nfs_inode_cachep))
printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
Index: linux-2.6/fs/nfs/pagelist.c
===================================================================
--- linux-2.6.orig/fs/nfs/pagelist.c
+++ linux-2.6/fs/nfs/pagelist.c
@@ -390,7 +390,7 @@ int __init nfs_init_nfspagecache(void)
return 0;
}
-void __exit nfs_destroy_nfspagecache(void)
+void nfs_destroy_nfspagecache(void)
{
if (kmem_cache_destroy(nfs_page_cachep))
printk(KERN_INFO "nfs_page: not all structures were freed\n");
Index: linux-2.6/fs/nfs/read.c
===================================================================
--- linux-2.6.orig/fs/nfs/read.c
+++ linux-2.6/fs/nfs/read.c
@@ -711,7 +711,7 @@ int __init nfs_init_readpagecache(void)
return 0;
}
-void __exit nfs_destroy_readpagecache(void)
+void nfs_destroy_readpagecache(void)
{
mempool_destroy(nfs_rdata_mempool);
if (kmem_cache_destroy(nfs_rdata_cachep))
Index: linux-2.6/fs/nfs/write.c
===================================================================
--- linux-2.6.orig/fs/nfs/write.c
+++ linux-2.6/fs/nfs/write.c
@@ -1551,7 +1551,7 @@ int __init nfs_init_writepagecache(void)
return 0;
}
-void __exit nfs_destroy_writepagecache(void)
+void nfs_destroy_writepagecache(void)
{
mempool_destroy(nfs_commit_mempool);
mempool_destroy(nfs_wdata_mempool);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch] fix static linking of NFS
2006-06-27 9:29 [patch] fix static linking of NFS Jes Sorensen
@ 2006-06-27 16:33 ` Trond Myklebust
2006-06-27 16:44 ` Trond Myklebust
0 siblings, 1 reply; 7+ messages in thread
From: Trond Myklebust @ 2006-06-27 16:33 UTC (permalink / raw)
To: Jes Sorensen; +Cc: Linus Torvalds, Andrew Morton, linux-kernel, David Brownell
On Tue, 2006-06-27 at 05:29 -0400, Jes Sorensen wrote:
> Hi,
>
> This patch solved the problem where certain functions in the NFS code
> goes missing due to the __exit section being discarded for static
> links.
>
> I saw one other version of this patch from David Brownell, but it had
> clutter left on the lines where the __exit should simply be removed.
>
> Cheers,
> Jes
>
> Remove __exit declarations from functions called from __init code to
> avoid link errors when the __exit section is discarded, eg NFS is
> linked statically into the kernel.
>
> Signed-off-by: Jes Sorensen <jes@sgi.com>
Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cheers,
Trond
> ---
> fs/nfs/direct.c | 2 +-
> fs/nfs/inode.c | 2 +-
> fs/nfs/pagelist.c | 2 +-
> fs/nfs/read.c | 2 +-
> fs/nfs/write.c | 2 +-
> 5 files changed, 5 insertions(+), 5 deletions(-)
>
> Index: linux-2.6/fs/nfs/direct.c
> ===================================================================
> --- linux-2.6.orig/fs/nfs/direct.c
> +++ linux-2.6/fs/nfs/direct.c
> @@ -909,7 +909,7 @@ int __init nfs_init_directcache(void)
> * nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures
> *
> */
> -void __exit nfs_destroy_directcache(void)
> +void nfs_destroy_directcache(void)
> {
> if (kmem_cache_destroy(nfs_direct_cachep))
> printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");
> Index: linux-2.6/fs/nfs/inode.c
> ===================================================================
> --- linux-2.6.orig/fs/nfs/inode.c
> +++ linux-2.6/fs/nfs/inode.c
> @@ -1132,7 +1132,7 @@ static int __init nfs_init_inodecache(vo
> return 0;
> }
>
> -static void __exit nfs_destroy_inodecache(void)
> +static void nfs_destroy_inodecache(void)
> {
> if (kmem_cache_destroy(nfs_inode_cachep))
> printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
> Index: linux-2.6/fs/nfs/pagelist.c
> ===================================================================
> --- linux-2.6.orig/fs/nfs/pagelist.c
> +++ linux-2.6/fs/nfs/pagelist.c
> @@ -390,7 +390,7 @@ int __init nfs_init_nfspagecache(void)
> return 0;
> }
>
> -void __exit nfs_destroy_nfspagecache(void)
> +void nfs_destroy_nfspagecache(void)
> {
> if (kmem_cache_destroy(nfs_page_cachep))
> printk(KERN_INFO "nfs_page: not all structures were freed\n");
> Index: linux-2.6/fs/nfs/read.c
> ===================================================================
> --- linux-2.6.orig/fs/nfs/read.c
> +++ linux-2.6/fs/nfs/read.c
> @@ -711,7 +711,7 @@ int __init nfs_init_readpagecache(void)
> return 0;
> }
>
> -void __exit nfs_destroy_readpagecache(void)
> +void nfs_destroy_readpagecache(void)
> {
> mempool_destroy(nfs_rdata_mempool);
> if (kmem_cache_destroy(nfs_rdata_cachep))
> Index: linux-2.6/fs/nfs/write.c
> ===================================================================
> --- linux-2.6.orig/fs/nfs/write.c
> +++ linux-2.6/fs/nfs/write.c
> @@ -1551,7 +1551,7 @@ int __init nfs_init_writepagecache(void)
> return 0;
> }
>
> -void __exit nfs_destroy_writepagecache(void)
> +void nfs_destroy_writepagecache(void)
> {
> mempool_destroy(nfs_commit_mempool);
> mempool_destroy(nfs_wdata_mempool);
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch] fix static linking of NFS
2006-06-27 16:33 ` Trond Myklebust
@ 2006-06-27 16:44 ` Trond Myklebust
2006-06-27 19:01 ` Jes Sorensen
0 siblings, 1 reply; 7+ messages in thread
From: Trond Myklebust @ 2006-06-27 16:44 UTC (permalink / raw)
To: Jes Sorensen; +Cc: Linus Torvalds, Andrew Morton, linux-kernel, David Brownell
On Tue, 2006-06-27 at 12:33 -0400, Trond Myklebust wrote:
> On Tue, 2006-06-27 at 05:29 -0400, Jes Sorensen wrote:
> > Hi,
> >
> > This patch solved the problem where certain functions in the NFS code
> > goes missing due to the __exit section being discarded for static
> > links.
> >
> > I saw one other version of this patch from David Brownell, but it had
> > clutter left on the lines where the __exit should simply be removed.
> >
> > Cheers,
> > Jes
> >
> > Remove __exit declarations from functions called from __init code to
> > avoid link errors when the __exit section is discarded, eg NFS is
> > linked statically into the kernel.
> >
> > Signed-off-by: Jes Sorensen <jes@sgi.com>
> Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Oops... I was a bit too quick there. Could you clean up the forward
declarations in "internal.h" too, please.
Cheers,
Trond
> Cheers,
> Trond
>
>
> > ---
> > fs/nfs/direct.c | 2 +-
> > fs/nfs/inode.c | 2 +-
> > fs/nfs/pagelist.c | 2 +-
> > fs/nfs/read.c | 2 +-
> > fs/nfs/write.c | 2 +-
> > 5 files changed, 5 insertions(+), 5 deletions(-)
> >
> > Index: linux-2.6/fs/nfs/direct.c
> > ===================================================================
> > --- linux-2.6.orig/fs/nfs/direct.c
> > +++ linux-2.6/fs/nfs/direct.c
> > @@ -909,7 +909,7 @@ int __init nfs_init_directcache(void)
> > * nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures
> > *
> > */
> > -void __exit nfs_destroy_directcache(void)
> > +void nfs_destroy_directcache(void)
> > {
> > if (kmem_cache_destroy(nfs_direct_cachep))
> > printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");
> > Index: linux-2.6/fs/nfs/inode.c
> > ===================================================================
> > --- linux-2.6.orig/fs/nfs/inode.c
> > +++ linux-2.6/fs/nfs/inode.c
> > @@ -1132,7 +1132,7 @@ static int __init nfs_init_inodecache(vo
> > return 0;
> > }
> >
> > -static void __exit nfs_destroy_inodecache(void)
> > +static void nfs_destroy_inodecache(void)
> > {
> > if (kmem_cache_destroy(nfs_inode_cachep))
> > printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
> > Index: linux-2.6/fs/nfs/pagelist.c
> > ===================================================================
> > --- linux-2.6.orig/fs/nfs/pagelist.c
> > +++ linux-2.6/fs/nfs/pagelist.c
> > @@ -390,7 +390,7 @@ int __init nfs_init_nfspagecache(void)
> > return 0;
> > }
> >
> > -void __exit nfs_destroy_nfspagecache(void)
> > +void nfs_destroy_nfspagecache(void)
> > {
> > if (kmem_cache_destroy(nfs_page_cachep))
> > printk(KERN_INFO "nfs_page: not all structures were freed\n");
> > Index: linux-2.6/fs/nfs/read.c
> > ===================================================================
> > --- linux-2.6.orig/fs/nfs/read.c
> > +++ linux-2.6/fs/nfs/read.c
> > @@ -711,7 +711,7 @@ int __init nfs_init_readpagecache(void)
> > return 0;
> > }
> >
> > -void __exit nfs_destroy_readpagecache(void)
> > +void nfs_destroy_readpagecache(void)
> > {
> > mempool_destroy(nfs_rdata_mempool);
> > if (kmem_cache_destroy(nfs_rdata_cachep))
> > Index: linux-2.6/fs/nfs/write.c
> > ===================================================================
> > --- linux-2.6.orig/fs/nfs/write.c
> > +++ linux-2.6/fs/nfs/write.c
> > @@ -1551,7 +1551,7 @@ int __init nfs_init_writepagecache(void)
> > return 0;
> > }
> >
> > -void __exit nfs_destroy_writepagecache(void)
> > +void nfs_destroy_writepagecache(void)
> > {
> > mempool_destroy(nfs_commit_mempool);
> > mempool_destroy(nfs_wdata_mempool);
> > -
> > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
> > Please read the FAQ at http://www.tux.org/lkml/
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch] fix static linking of NFS
2006-06-27 16:44 ` Trond Myklebust
@ 2006-06-27 19:01 ` Jes Sorensen
2006-06-27 19:21 ` David Brownell
0 siblings, 1 reply; 7+ messages in thread
From: Jes Sorensen @ 2006-06-27 19:01 UTC (permalink / raw)
To: Trond Myklebust
Cc: Linus Torvalds, Andrew Morton, linux-kernel, David Brownell
Trond Myklebust wrote:
> On Tue, 2006-06-27 at 12:33 -0400, Trond Myklebust wrote:
>>> Remove __exit declarations from functions called from __init code to
>>> avoid link errors when the __exit section is discarded, eg NFS is
>>> linked statically into the kernel.
>>>
>>> Signed-off-by: Jes Sorensen <jes@sgi.com>
>> Acked-by: Trond Myklebust <Trond.Myklebust@netapp.com>
>
> Oops... I was a bit too quick there. Could you clean up the forward
> declarations in "internal.h" too, please.
>
> Cheers,
> Trond
Good point, I didn't notice those because the compiler didn't moan. I'll
look into doing another patch, but it might not be until Thursday.
Cheers,
Jes
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] fix static linking of NFS
2006-06-27 19:01 ` Jes Sorensen
@ 2006-06-27 19:21 ` David Brownell
2006-06-27 19:59 ` David Brownell
0 siblings, 1 reply; 7+ messages in thread
From: David Brownell @ 2006-06-27 19:21 UTC (permalink / raw)
To: Jes Sorensen, Trond Myklebust; +Cc: Andrew Morton, Linus Torvalds, linux-kernel
OK here's a version of my patch that I edited to remove the
comments Jes objected to ... /* init or exit */ to remind
about the omitted section annotation. Having one of those
would save multiple kbytes throughout the kernel, and I had
include the comments as reminders for an eventual fix...
- Dave
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [patch] fix static linking of NFS
2006-06-27 19:21 ` David Brownell
@ 2006-06-27 19:59 ` David Brownell
2006-06-27 20:08 ` Trond Myklebust
0 siblings, 1 reply; 7+ messages in thread
From: David Brownell @ 2006-06-27 19:59 UTC (permalink / raw)
To: Jes Sorensen; +Cc: Trond Myklebust, Andrew Morton, Linus Torvalds, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 400 bytes --]
On Tuesday 27 June 2006 12:21 pm, David Brownell wrote:
> OK here's a version of my patch that I edited to remove the
> comments Jes objected to ... /* init or exit */ to remind
> about the omitted section annotation. Having one of those
> would save multiple kbytes throughout the kernel, and I had
> include the comments as reminders for an eventual fix...
>
> - Dave
>
Once more, with patch.
[-- Attachment #2: nfs.patch --]
[-- Type: text/x-diff, Size: 3950 bytes --]
Builds on ARM report link problems with common configurations like
statically linked NFS (for nfsroot). The symptom is that __init
section code references __exit section code; that won't work since
the exit sections are discarded (since they can never be called).
The best fix for these particular cases would be an "__init_or_exit"
section annotation.
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Index: at91/fs/nfs/direct.c
===================================================================
--- at91.orig/fs/nfs/direct.c 2006-06-26 14:28:55.000000000 -0700
+++ at91/fs/nfs/direct.c 2006-06-26 14:32:39.000000000 -0700
@@ -909,7 +909,7 @@ int __init nfs_init_directcache(void)
* nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures
*
*/
-void __exit nfs_destroy_directcache(void)
+void nfs_destroy_directcache(void)
{
if (kmem_cache_destroy(nfs_direct_cachep))
printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");
Index: at91/fs/nfs/inode.c
===================================================================
--- at91.orig/fs/nfs/inode.c 2006-06-26 14:28:55.000000000 -0700
+++ at91/fs/nfs/inode.c 2006-06-26 14:32:39.000000000 -0700
@@ -1132,7 +1132,7 @@ static int __init nfs_init_inodecache(vo
return 0;
}
-static void __exit nfs_destroy_inodecache(void)
+static void nfs_destroy_inodecache(void)
{
if (kmem_cache_destroy(nfs_inode_cachep))
printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
Index: at91/fs/nfs/internal.h
===================================================================
--- at91.orig/fs/nfs/internal.h 2006-06-26 14:28:55.000000000 -0700
+++ at91/fs/nfs/internal.h 2006-06-26 14:32:39.000000000 -0700
@@ -31,15 +31,15 @@ extern struct svc_version nfs4_callback_
/* pagelist.c */
extern int __init nfs_init_nfspagecache(void);
-extern void __exit nfs_destroy_nfspagecache(void);
+extern void nfs_destroy_nfspagecache(void);
extern int __init nfs_init_readpagecache(void);
-extern void __exit nfs_destroy_readpagecache(void);
+extern void nfs_destroy_readpagecache(void);
extern int __init nfs_init_writepagecache(void);
-extern void __exit nfs_destroy_writepagecache(void);
+extern void nfs_destroy_writepagecache(void);
#ifdef CONFIG_NFS_DIRECTIO
extern int __init nfs_init_directcache(void);
-extern void __exit nfs_destroy_directcache(void);
+extern void nfs_destroy_directcache(void);
#else
#define nfs_init_directcache() (0)
#define nfs_destroy_directcache() do {} while(0)
Index: at91/fs/nfs/pagelist.c
===================================================================
--- at91.orig/fs/nfs/pagelist.c 2006-06-26 14:28:55.000000000 -0700
+++ at91/fs/nfs/pagelist.c 2006-06-26 14:32:39.000000000 -0700
@@ -390,7 +390,7 @@ int __init nfs_init_nfspagecache(void)
return 0;
}
-void __exit nfs_destroy_nfspagecache(void)
+void nfs_destroy_nfspagecache(void)
{
if (kmem_cache_destroy(nfs_page_cachep))
printk(KERN_INFO "nfs_page: not all structures were freed\n");
Index: at91/fs/nfs/read.c
===================================================================
--- at91.orig/fs/nfs/read.c 2006-06-26 14:28:55.000000000 -0700
+++ at91/fs/nfs/read.c 2006-06-26 14:32:39.000000000 -0700
@@ -711,7 +711,7 @@ int __init nfs_init_readpagecache(void)
return 0;
}
-void __exit nfs_destroy_readpagecache(void)
+void nfs_destroy_readpagecache(void)
{
mempool_destroy(nfs_rdata_mempool);
if (kmem_cache_destroy(nfs_rdata_cachep))
Index: at91/fs/nfs/write.c
===================================================================
--- at91.orig/fs/nfs/write.c 2006-06-26 14:28:55.000000000 -0700
+++ at91/fs/nfs/write.c 2006-06-26 14:32:39.000000000 -0700
@@ -1551,7 +1551,7 @@ int __init nfs_init_writepagecache(void)
return 0;
}
-void __exit nfs_destroy_writepagecache(void)
+void nfs_destroy_writepagecache(void)
{
mempool_destroy(nfs_commit_mempool);
mempool_destroy(nfs_wdata_mempool);
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [patch] fix static linking of NFS
2006-06-27 19:59 ` David Brownell
@ 2006-06-27 20:08 ` Trond Myklebust
0 siblings, 0 replies; 7+ messages in thread
From: Trond Myklebust @ 2006-06-27 20:08 UTC (permalink / raw)
To: David Brownell; +Cc: Jes Sorensen, Andrew Morton, Linus Torvalds, linux-kernel
On Tue, 2006-06-27 at 12:59 -0700, David Brownell wrote:
> On Tuesday 27 June 2006 12:21 pm, David Brownell wrote:
> > OK here's a version of my patch that I edited to remove the
> > comments Jes objected to ... /* init or exit */ to remind
> > about the omitted section annotation. Having one of those
> > would save multiple kbytes throughout the kernel, and I had
> > include the comments as reminders for an eventual fix...
> >
> > - Dave
> >
>
>
> Once more, with patch.
Acked...
Cheers,
Trond
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2006-06-27 20:08 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-06-27 9:29 [patch] fix static linking of NFS Jes Sorensen
2006-06-27 16:33 ` Trond Myklebust
2006-06-27 16:44 ` Trond Myklebust
2006-06-27 19:01 ` Jes Sorensen
2006-06-27 19:21 ` David Brownell
2006-06-27 19:59 ` David Brownell
2006-06-27 20:08 ` Trond Myklebust
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox