From 07eb7a5830c6e587341f6f95a25738f9d6c2cb01 Mon Sep 17 00:00:00 2001 From: steve Date: Thu, 29 Nov 2001 13:44:46 +0000 Subject: [PATCH] New patches for 2.4.16 --- driver/device-mapper/patches/00_config | 5 ++-- driver/device-mapper/patches/00_do_umount | 29 ++++++++++-------- driver/device-mapper/patches/00_ksyms | 36 +++++++++++++++++++++-- driver/device-mapper/patches/00_makefile | 11 +++---- driver/device-mapper/patches/00_seq_file | 11 +++++++ 5 files changed, 69 insertions(+), 23 deletions(-) create mode 100644 driver/device-mapper/patches/00_seq_file diff --git a/driver/device-mapper/patches/00_config b/driver/device-mapper/patches/00_config index cc918029a..c321f5fc2 100644 --- a/driver/device-mapper/patches/00_config +++ b/driver/device-mapper/patches/00_config @@ -1,5 +1,6 @@ ---- linux-2.4.14/drivers/md/Config.in Mon Sep 24 16:29:14 2001 -+++ linux/drivers/md/Config.in Tue Nov 6 11:25:35 2001 +diff -ru linux-2.4.16/drivers/md/Config.in linux/drivers/md/Config.in +--- linux-2.4.16/drivers/md/Config.in Mon Sep 24 16:29:14 2001 ++++ linux/drivers/md/Config.in Thu Nov 29 10:27:35 2001 @@ -14,5 +14,7 @@ dep_tristate ' Multipath I/O support' CONFIG_MD_MULTIPATH $CONFIG_BLK_DEV_MD diff --git a/driver/device-mapper/patches/00_do_umount b/driver/device-mapper/patches/00_do_umount index af9dc8625..0c852d264 100644 --- a/driver/device-mapper/patches/00_do_umount +++ b/driver/device-mapper/patches/00_do_umount @@ -1,16 +1,7 @@ ---- linux-2.4.14/include/linux/fs.h Fri Nov 23 12:10:17 2001 -+++ linux/include/linux/fs.h Fri Nov 23 11:41:13 2001 -@@ -968,6 +968,7 @@ - extern struct vfsmount *kern_mount(struct file_system_type *); - extern int may_umount(struct vfsmount *); - extern long do_mount(char *, char *, char *, unsigned long, void *); -+extern int do_umount(struct vfsmount *mnt, int flags); - - #define kern_umount mntput - ---- linux-2.4.14/fs/namespace.c Tue Oct 16 02:47:36 2001 -+++ linux/fs/namespace.c Fri Nov 23 12:08:13 2001 -@@ -359,7 +359,7 @@ +diff -ru linux-2.4.16/fs/namespace.c linux/fs/namespace.c +--- linux-2.4.16/fs/namespace.c Tue Nov 27 15:56:03 2001 ++++ linux/fs/namespace.c Thu Nov 29 10:27:27 2001 +@@ -332,7 +332,7 @@ } } @@ -19,3 +10,15 @@ { struct super_block * sb = mnt->mnt_sb; int retval = 0; +Only in linux/include/linux: device-mapper.h +diff -ru linux-2.4.16/include/linux/fs.h linux/include/linux/fs.h +--- linux-2.4.16/include/linux/fs.h Tue Nov 27 15:56:14 2001 ++++ linux/include/linux/fs.h Thu Nov 29 10:33:35 2001 +@@ -980,6 +980,7 @@ + extern struct vfsmount *kern_mount(struct file_system_type *); + extern int may_umount(struct vfsmount *); + extern long do_mount(char *, char *, char *, unsigned long, void *); ++extern int do_umount(struct vfsmount *mnt, int flags); + + #define kern_umount mntput + diff --git a/driver/device-mapper/patches/00_ksyms b/driver/device-mapper/patches/00_ksyms index fa62ad660..96fc124c8 100644 --- a/driver/device-mapper/patches/00_ksyms +++ b/driver/device-mapper/patches/00_ksyms @@ -1,6 +1,36 @@ ---- linux-2.4.14/kernel/ksyms.c Tue Nov 6 11:18:14 2001 -+++ linux/kernel/ksyms.c Wed Nov 7 11:26:45 2001 -@@ -521,6 +521,7 @@ +diff -ru linux-2.4.16/kernel/ksyms.c linux/kernel/ksyms.c +--- linux-2.4.16/kernel/ksyms.c Tue Nov 27 15:56:08 2001 ++++ linux/kernel/ksyms.c Thu Nov 29 10:51:49 2001 +@@ -46,6 +46,7 @@ + #include + #include + #include ++#include + #include + + #if defined(CONFIG_PROC_FS) +@@ -323,6 +324,7 @@ + EXPORT_SYMBOL(register_filesystem); + EXPORT_SYMBOL(unregister_filesystem); + EXPORT_SYMBOL(kern_mount); ++EXPORT_SYMBOL(do_umount); + EXPORT_SYMBOL(__mntput); + EXPORT_SYMBOL(may_umount); + +@@ -348,6 +350,12 @@ + EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax); + EXPORT_SYMBOL(proc_doulongvec_minmax); + ++/* seq_file */ ++EXPORT_SYMBOL(seq_read); ++EXPORT_SYMBOL(seq_lseek); ++EXPORT_SYMBOL(seq_open); ++EXPORT_SYMBOL(seq_release); ++ + /* interrupt handling */ + EXPORT_SYMBOL(add_timer); + EXPORT_SYMBOL(del_timer); +@@ -522,6 +530,7 @@ /* binfmt_aout */ EXPORT_SYMBOL(get_write_access); diff --git a/driver/device-mapper/patches/00_makefile b/driver/device-mapper/patches/00_makefile index 220391692..c4c3ecd8b 100644 --- a/driver/device-mapper/patches/00_makefile +++ b/driver/device-mapper/patches/00_makefile @@ -1,5 +1,6 @@ ---- linux-2.4.14/drivers/md/Makefile Mon Sep 24 16:29:14 2001 -+++ linux/drivers/md/Makefile Wed Nov 7 10:48:26 2001 +diff -ru linux-2.4.16/drivers/md/Makefile linux/drivers/md/Makefile +--- linux-2.4.16/drivers/md/Makefile Tue Nov 27 15:55:57 2001 ++++ linux/drivers/md/Makefile Thu Nov 29 10:30:29 2001 @@ -4,9 +4,12 @@ O_TARGET := mddev.o @@ -7,10 +8,10 @@ -export-objs := md.o xor.o +export-objs := md.o xor.o dm-table.o dm-target.o list-multi := lvm-mod.o - lvm-mod-objs := lvm.o lvm-snap.o + lvm-mod-objs := lvm.o lvm-snap.o lvm-fs.o +dm-mod-objs := dm.o dm-table.o dm-target.o dmfs-super.o dmfs-root.o \ -+ dmfs-tdir.o dmfs-table.o dmfs-error.o dmfs-status.o \ -+ dmfs-lv.o seq_file.o ++ dmfs-lv.o dmfs-table.o dmfs-error.o dmfs-status.o \ ++ dmfs-active.o # Note: link order is important. All raid personalities # and xor.o must come before md.o, as they each initialise diff --git a/driver/device-mapper/patches/00_seq_file b/driver/device-mapper/patches/00_seq_file new file mode 100644 index 000000000..4f73967fb --- /dev/null +++ b/driver/device-mapper/patches/00_seq_file @@ -0,0 +1,11 @@ +diff -ru linux-2.4.16/include/linux/seq_file.h linux/include/linux/seq_file.h +--- linux-2.4.16/include/linux/seq_file.h Tue Nov 27 15:56:08 2001 ++++ linux/include/linux/seq_file.h Thu Nov 29 10:38:37 2001 +@@ -12,6 +12,7 @@ + loff_t index; + struct semaphore sem; + struct seq_operations *op; ++ void *context; + }; + + struct seq_operations {