Skip to contentSkip to conversation

ext2 module build failure (2.4.13pre6)

PATCH In review Andreas Steinmetz 3 participants 6 messages Oct 23, 2001

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ext2 module build failure (2.4.13pre6)

ext2 build as a module fails to missing export of generic_direct_IO which the attached patch fixes.

<grumble>
posted this at 2.4.13pre2 time, now we're up to pre6 and nobody cares... </grumble>

Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH

kernel/ksyms.c +1 -0
@@ -205,6 +205,7 @@
 EXPORT_SYMBOL(block_sync_page);
 EXPORT_SYMBOL(cont_prepare_write);
 EXPORT_SYMBOL(generic_commit_write);
+EXPORT_SYMBOL(generic_direct_IO);
 EXPORT_SYMBOL(block_truncate_page);
 EXPORT_SYMBOL(generic_block_bmap);
 EXPORT_SYMBOL(waitfor_one_page);
#1 lore raw
Quoted 7 lines · Andreas Steinmetz

ext2 build as a module fails to missing export of generic_direct_IO which the attached patch fixes.

<grumble>
posted this at 2.4.13pre2 time, now we're up to pre6 and nobody cares... </grumble>

Interesting considering this function does not exist at all in 2.4.13-pre6...

Jeff

Signature · 3 lines
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno
#2 lore raw
# nm ./lib/modules/2.4.13-pre6/kernel/fs/ext2/ext2.o | \
Quoted 1 line

grep generic_direct_IO

U generic_direct_IO
#

Now what's that? some ghost?

Quoted 6 lines · On 23-Oct-2001 Jeff Garzik wrote:
Quoted 5 lines · Andreas Steinmetz

ext2 build as a module fails to missing export of generic_direct_IO which the
attached patch fixes.

Quoted 16 lines
Quoted 3 lines

<grumble>
posted this at 2.4.13pre2 time, now we're up to pre6 and nobody cares... </grumble>

Interesting considering this function does not exist at all in 2.4.13-pre6...

Jeff

Signature · 3 lines
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno

Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH

#3 lore raw
Quoted 7 lines · Andreas Steinmetz
# nm ./lib/modules/2.4.13-pre6/kernel/fs/ext2/ext2.o | \
Quoted 1 line

grep generic_direct_IO

U generic_direct_IO
#

Now what's that? some ghost?

I guess so :)

Quoted 34 lines

[jgarzik@cum linux-2.4.13-pre6]$ bzcat /g/download/kernel/patch-2.4.13-pre6.bz2 | grep generic_direct_IO [jgarzik@cum linux-2.4.13-pre6]$ bzcat /g/download/kernel/linux-2.4.12.tar.bz2 |grep generic_direct_IO [jgarzik@cum linux-2.4.13-pre6]$ grep -r generic_direct_IO .
[jgarzik@cum linux-2.4.13-pre6]$ cd ~/cvs/linux_2_4/
[jgarzik@cum linux_2_4]$ nm vmlinux | grep generic_direct_IO
[jgarzik@cum linux_2_4]$

Quoted 13 lines · On 23-Oct-2001 Jeff Garzik wrote:
Quoted 8 lines · Andreas Steinmetz

ext2 build as a module fails to missing export of generic_direct_IO which the
attached patch fixes.

<grumble>
posted this at 2.4.13pre2 time, now we're up to pre6 and nobody cares... </grumble>

Interesting considering this function does not exist at all in 2.4.13-pre6...

Quoted 9 lines

Jeff

--

Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno

Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH

Signature · 3 lines
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno
#4 lore raw

Ouch, make that an aa patch error (2.4.13pre5aa1, sorry, mixed that in, insufficient caffeine...)

Quoted 11 lines · On 23-Oct-2001 Jeff Garzik wrote:
Quoted 7 lines · Andreas Steinmetz
# nm ./lib/modules/2.4.13-pre6/kernel/fs/ext2/ext2.o | \
Quoted 1 line

grep generic_direct_IO

U generic_direct_IO
#

Now what's that? some ghost?

I guess so :)

Ouch: make that an aa patch error (sorry, mixed that in).

Quoted 34 lines
Quoted 34 lines

[jgarzik@cum linux-2.4.13-pre6]$ bzcat /g/download/kernel/patch-2.4.13-pre6.bz2 | grep generic_direct_IO [jgarzik@cum linux-2.4.13-pre6]$ bzcat /g/download/kernel/linux-2.4.12.tar.bz2 |grep generic_direct_IO [jgarzik@cum linux-2.4.13-pre6]$ grep -r generic_direct_IO . [jgarzik@cum linux-2.4.13-pre6]$ cd ~/cvs/linux_2_4/ [jgarzik@cum linux_2_4]$ nm vmlinux | grep generic_direct_IO [jgarzik@cum linux_2_4]$

Quoted 22 lines · On 23-Oct-2001 Jeff Garzik wrote:
Quoted 8 lines · Andreas Steinmetz

ext2 build as a module fails to missing export of generic_direct_IO which the
attached patch fixes.

<grumble>
posted this at 2.4.13pre2 time, now we're up to pre6 and nobody cares... </grumble>

Interesting considering this function does not exist at all in 2.4.13-pre6...

Jeff

--

Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno
Quoted 9 lines
Quoted 2 lines

Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH

Signature · 3 lines
Jeff Garzik      | Only so many songs can be sung
Building 1024    | with two lips, two lungs, and one tongue.
MandrakeSoft     |         - nomeansno

Andreas Steinmetz
D.O.M. Datenverarbeitung GmbH

#5 lore raw
In reply to Jeff Garzik
Quoted 2 lines · Andreas Steinmetz

Ouch, make that an aa patch error (2.4.13pre5aa1, sorry, mixed that in, insufficient caffeine...)

This should fix it:

fs/block_dev.c +6 -0
diff -urN 2.4.13pre6/fs/block_dev.c o_direct/fs/block_dev.c
@@ -113,6 +113,11 @@
 	return 0;
 }
 
+static int blkdev_direct_IO(int rw, struct inode * inode, struct kiobuf * iobuf, unsigned long blocknr, int blocksize)
+{
+	return generic_direct_IO(rw, inode, iobuf, blocknr, blocksize, blkdev_get_block);
+}
+
 static int blkdev_writepage(struct page * page)
 {
 	return block_write_full_page(page, blkdev_get_block);
@@ -632,6 +637,7 @@
 	sync_page: block_sync_page,
 	prepare_write: blkdev_prepare_write,
 	commit_write: blkdev_commit_write,
+	direct_IO: blkdev_direct_IO,
 };
 
 struct file_operations def_blk_fops = {
fs/buffer.c +41 -0

47 lines not on this page · raw message

fs/ext2/inode.c +6 -1
diff -urN 2.4.13pre6/fs/ext2/inode.c o_direct/fs/ext2/inode.c
@@ -592,13 +592,18 @@
 {
 	return generic_block_bmap(mapping,block,ext2_get_block);
 }
+static int ext2_direct_IO(int rw, struct inode * inode, struct kiobuf * iobuf, unsigned long blocknr, int blocksize)
+{
+	return generic_direct_IO(rw, inode, iobuf, blocknr, blocksize, ext2_get_block);
+}
 struct address_space_operations ext2_aops = {
 	readpage: ext2_readpage,
 	writepage: ext2_writepage,
 	sync_page: block_sync_page,
 	prepare_write: ext2_prepare_write,
 	commit_write: generic_commit_write,
-	bmap: ext2_bmap
+	bmap: ext2_bmap,
+	direct_IO: ext2_direct_IO,
 };
 
 /*
include/linux/fs.h +1 -0
diff -urN 2.4.13pre6/include/linux/fs.h o_direct/include/linux/fs.h
@@ -1368,6 +1368,7 @@
 int generic_block_bmap(struct address_space *, long, get_block_t *);
 int generic_commit_write(struct file *, struct page *, unsigned, unsigned);
 int block_truncate_page(struct address_space *, loff_t, get_block_t *);
+extern int generic_direct_IO(int, struct inode *, struct kiobuf *, unsigned long, int, get_block_t *);
 extern void create_empty_buffers(struct page *, kdev_t, unsigned long);
 
 extern int waitfor_one_page(struct page*);
kernel/ksyms.c +1 -0
diff -urN 2.4.13pre6/kernel/ksyms.c o_direct/kernel/ksyms.c
@@ -199,6 +199,7 @@
 EXPORT_SYMBOL(unlock_buffer);
 EXPORT_SYMBOL(__wait_on_buffer);
 EXPORT_SYMBOL(___wait_on_page);
+EXPORT_SYMBOL(generic_direct_IO);
 EXPORT_SYMBOL(block_write_full_page);
 EXPORT_SYMBOL(block_read_full_page);
 EXPORT_SYMBOL(block_prepare_write);
mm/filemap.c +131 -1

175 lines not on this page · raw message

Andrea