a few patches against 2.5.2-pre3
Appended are a few patches against 2.5.2-pre3 to fix problems with undefined symbols in the lvm, nfs, and intermezzo modules. Specifically, the lvm patch changes a lvm_get_blksize() reference to block_size(), the nfs patch is a repost of prior art (I don't claim it, and I don't remember who the original contributor is), and the intermezzo patch takes care of an undefined ioctl command (missing include file).
Associated functionality NOT verified. If these patches appear to be correct, please include them in 2.5.2.
Signature · 4 lines
----------------------------------------------------------------------- Bob Tracy WTO + WIPO = DMCA? http://www.anti-dmca.org [email protected] -----------------------------------------------------------------------
drivers/md/lvm.c renamed from drivers/md/lvm.c.orig +1 -1
@@ -1046,7 +1046,7 @@memset (&bio,0 ,sizeof (bio)); bio.bi_dev = inode->i_rdev; - bio.bi_size =lvm_get_blksize (bio.bi_dev);/* NEEDED by bio_sectors */ + bio.bi_size =block_size (bio.bi_dev);/* NEEDED by bio_sectors */ bio.bi_sector = block *bio_sectors (&bio); bio.bi_rw =READ ;if ((err=lvm_map (&bio)) <0 ) {
fs/Makefile +1 -1
@@ -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 \
fs/seq_file.c +7 -0
@@ -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);
include/linux/seq_file.h +6 -6
@@ -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
fs/intermezzo/psdev.c renamed from fs/intermezzo/psdev.c.orig +1 -0
@@ -50,6 +50,7 @@#include <asm/system.h> #include <asm/poll.h> #include <asm/uaccess.h> +#include <asm/ioctls.h> #include <linux/intermezzo_fs.h> #include <linux/intermezzo_upcall.h>