2.5.1-pre8 -- fix to compile nfs as module

2.5.1-pre8 -- fix to compile nfs as module

[Craig Christophel]

[-- Attachment #1: Type: text/plain, Size: 254 bytes --]

Attached is a patch to allow nfs to compile as a module.  Please check it out 
as I just:

exported symbols from fs/seq_file.c 
added the seq_file.o to the obj-exports in the VFS Makefile and 
added an ifdef for modversions in fs/nfs/inode.c.  


	Craig.

[-- Attachment #2: nfs-module-2.5-unresolved-symbols.diff --]
[-- Type: text/x-diff, Size: 2396 bytes --]

diff -urN linux/fs/Makefile linux.mt/fs/Makefile
--- linux/fs/Makefile	Sun Dec  9 23:57:24 2001
+++ linux.mt/fs/Makefile	Mon Dec 10 22:18:31 2001
@@ -7,7 +7,7 @@
 
 O_TARGET := fs.o
 
-export-objs :=	filesystems.o open.o dcache.o buffer.o bio.o
+export-objs :=	filesystems.o open.o dcache.o buffer.o bio.o seq_file.o
 mod-subdirs :=	nls
 
 obj-y :=	open.o read_write.o devices.o file_table.o buffer.o \
diff -urN linux/fs/nfs/inode.c linux.mt/fs/nfs/inode.c
--- linux/fs/nfs/inode.c	Sun Dec  9 23:57:24 2001
+++ linux.mt/fs/nfs/inode.c	Tue Dec 11 08:11:10 2001
@@ -15,6 +15,11 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
+
+#ifdef MODVERSIONS
+#include <linux/modversions.h>
+#endif
+
 #include <linux/init.h>
 
 #include <linux/sched.h>
diff -urN linux/fs/seq_file.c linux.mt/fs/seq_file.c
--- linux/fs/seq_file.c	Sat Nov 17 21:16:22 2001
+++ linux.mt/fs/seq_file.c	Tue Dec 11 00:39:09 2001
@@ -8,6 +8,7 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include <asm/uaccess.h>
 
@@ -293,3 +294,9 @@
 	m->count = m->size;
 	return -1;
 }
+EXPORT_SYMBOL(seq_printf);
+EXPORT_SYMBOL(seq_escape);
+EXPORT_SYMBOL(seq_release);
+EXPORT_SYMBOL(seq_lseek);
+EXPORT_SYMBOL(seq_open);
+EXPORT_SYMBOL(seq_read);
diff -urN linux/include/linux/seq_file.h linux.mt/include/linux/seq_file.h
--- linux/include/linux/seq_file.h	Sun Dec  9 23:57:24 2001
+++ linux.mt/include/linux/seq_file.h	Mon Dec 10 23:47:15 2001
@@ -26,11 +26,11 @@
 	int (*show) (struct seq_file *m, void *v);
 };
 
-int seq_open(struct file *, struct seq_operations *);
-ssize_t seq_read(struct file *, char *, size_t, loff_t *);
-loff_t seq_lseek(struct file *, loff_t, int);
-int seq_release(struct inode *, struct file *);
-int seq_escape(struct seq_file *, const char *, const char *);
+extern int seq_open(struct file *, struct seq_operations *);
+extern ssize_t seq_read(struct file *, char *, size_t, loff_t *);
+extern loff_t seq_lseek(struct file *, loff_t, int);
+extern int seq_release(struct inode *, struct file *);
+extern int seq_escape(struct seq_file *, const char *, const char *);
 
 static inline int seq_putc(struct seq_file *m, char c)
 {
@@ -53,7 +53,7 @@
 	return -1;
 }
 
-int seq_printf(struct seq_file *, const char *, ...)
+extern int seq_printf(struct seq_file *, const char *, ...)
 	__attribute__ ((format (printf,2,3)));
 
 #endif

Re: 2.5.1-pre8 -- fix to compile nfs as module

[Keith Owens]

On Tue, 11 Dec 2001 08:19:35 -0500, 
Craig Christophel <merlin@transgeek.com> wrote:
>added an ifdef for modversions in fs/nfs/inode.c.  

Don't!  The Makefile automatically adds modversions.h when required,
any code that explicitly includes modversions.h is broken.

Re: 2.5.1-pre8 -- fix to compile nfs as module

[Craig Christophel]

[-- Attachment #1: Type: text/plain, Size: 725 bytes --]

Thanks for the tip.....   I thought that could be incorrect.


well here is an updated patch without the modversions stuff.    


Craig.

On Tuesday 11 December 2001 18:48, Keith Owens wrote:
> On Tue, 11 Dec 2001 08:19:35 -0500,
>
> Craig Christophel <merlin@transgeek.com> wrote:
> >added an ifdef for modversions in fs/nfs/inode.c.
>
> Don't!  The Makefile automatically adds modversions.h when required,
> any code that explicitly includes modversions.h is broken.
>
> -
> 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/

[-- Attachment #2: nfs-module-2.5-unresolved-symbols.diff --]
[-- Type: text/x-diff, Size: 2046 bytes --]

diff -urN linux/fs/Makefile linux.mt/fs/Makefile
--- linux/fs/Makefile	Sun Dec  9 23:57:24 2001
+++ linux.mt/fs/Makefile	Mon Dec 10 22:18:31 2001
@@ -7,7 +7,7 @@
 
 O_TARGET := fs.o
 
-export-objs :=	filesystems.o open.o dcache.o buffer.o bio.o
+export-objs :=	filesystems.o open.o dcache.o buffer.o bio.o seq_file.o
 mod-subdirs :=	nls
 
 obj-y :=	open.o read_write.o devices.o file_table.o buffer.o \
diff -urN linux/fs/seq_file.c linux.mt/fs/seq_file.c
--- linux/fs/seq_file.c	Sat Nov 17 21:16:22 2001
+++ linux.mt/fs/seq_file.c	Tue Dec 11 00:39:09 2001
@@ -8,6 +8,7 @@
 #include <linux/fs.h>
 #include <linux/seq_file.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 
 #include <asm/uaccess.h>
 
@@ -293,3 +294,9 @@
 	m->count = m->size;
 	return -1;
 }
+EXPORT_SYMBOL(seq_printf);
+EXPORT_SYMBOL(seq_escape);
+EXPORT_SYMBOL(seq_release);
+EXPORT_SYMBOL(seq_lseek);
+EXPORT_SYMBOL(seq_open);
+EXPORT_SYMBOL(seq_read);
diff -urN linux/include/linux/seq_file.h linux.mt/include/linux/seq_file.h
--- linux/include/linux/seq_file.h	Sun Dec  9 23:57:24 2001
+++ linux.mt/include/linux/seq_file.h	Mon Dec 10 23:47:15 2001
@@ -26,11 +26,11 @@
 	int (*show) (struct seq_file *m, void *v);
 };
 
-int seq_open(struct file *, struct seq_operations *);
-ssize_t seq_read(struct file *, char *, size_t, loff_t *);
-loff_t seq_lseek(struct file *, loff_t, int);
-int seq_release(struct inode *, struct file *);
-int seq_escape(struct seq_file *, const char *, const char *);
+extern int seq_open(struct file *, struct seq_operations *);
+extern ssize_t seq_read(struct file *, char *, size_t, loff_t *);
+extern loff_t seq_lseek(struct file *, loff_t, int);
+extern int seq_release(struct inode *, struct file *);
+extern int seq_escape(struct seq_file *, const char *, const char *);
 
 static inline int seq_putc(struct seq_file *m, char c)
 {
@@ -53,7 +53,7 @@
 	return -1;
 }
 
-int seq_printf(struct seq_file *, const char *, ...)
+extern int seq_printf(struct seq_file *, const char *, ...)
 	__attribute__ ((format (printf,2,3)));
 
 #endif