From: braam Date: Sat, 5 Apr 2003 11:15:01 +0000 (+0000) Subject: - add ext3 patches to the kernel patch instead of extN directory, and X-Git-Tag: v1_7_100~1^248~113 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=78516b0f42923ad916b1cc60f3273bfe05ad1e40;p=fs%2Flustre-release.git - add ext3 patches to the kernel patch instead of extN directory, and associated changes. This branch will require a small amount of debugging, cleanup and some testing before landing. --- diff --git a/lustre/kernel_patches/patches/exports.patch b/lustre/kernel_patches/patches/exports.patch index 716c156..33e0b6c 100644 --- a/lustre/kernel_patches/patches/exports.patch +++ b/lustre/kernel_patches/patches/exports.patch @@ -7,20 +7,20 @@ kernel/ksyms.c | 5 +++++ 4 files changed, 9 insertions(+), 1 deletion(-) ---- linux-2.4.19-hp2_pnnl2/fs/ext3/Makefile~exports Sun Jan 19 18:52:38 2003 -+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/Makefile Sun Jan 19 18:52:38 2003 +--- linux-2.4.18-18/fs/ext3/Makefile~exports Sat Apr 5 02:51:27 2003 ++++ linux-2.4.18-18-braam/fs/ext3/Makefile Sat Apr 5 02:54:45 2003 @@ -9,6 +9,8 @@ O_TARGET := ext3.o -+export-objs := super.o ++export-objs := super.o inode.o + obj-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ ioctl.o namei.o super.o symlink.o obj-m := $(O_TARGET) ---- linux-2.4.19-hp2_pnnl2/fs/ext3/super.c~exports Sun Jan 19 18:52:38 2003 -+++ linux-2.4.19-hp2_pnnl2-root/fs/ext3/super.c Sun Jan 19 18:52:38 2003 -@@ -1744,7 +1744,7 @@ static void __exit exit_ext3_fs(void) +--- linux-2.4.18-18/fs/ext3/super.c~exports Sat Apr 5 02:51:27 2003 ++++ linux-2.4.18-18-braam/fs/ext3/super.c Sat Apr 5 02:54:28 2003 +@@ -1746,7 +1746,7 @@ static void __exit exit_ext3_fs(void) unregister_filesystem(&ext3_fs_type); } @@ -29,9 +29,9 @@ MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions"); ---- linux-2.4.19-hp2_pnnl2/include/linux/fs.h~exports Sun Jan 19 18:52:38 2003 -+++ linux-2.4.19-hp2_pnnl2-root/include/linux/fs.h Sun Jan 19 18:52:38 2003 -@@ -1020,6 +1020,7 @@ extern int unregister_filesystem(struct +--- linux-2.4.18-18/include/linux/fs.h~exports Sat Apr 5 02:51:27 2003 ++++ linux-2.4.18-18-braam/include/linux/fs.h Sat Apr 5 02:54:29 2003 +@@ -1046,6 +1046,7 @@ extern int unregister_filesystem(struct 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 *); @@ -39,11 +39,11 @@ extern void umount_tree(struct vfsmount *); #define kern_umount mntput ---- linux-2.4.19-hp2_pnnl2/kernel/ksyms.c~exports Sun Jan 19 18:52:38 2003 -+++ linux-2.4.19-hp2_pnnl2-root/kernel/ksyms.c Sun Jan 19 18:52:38 2003 -@@ -308,6 +308,11 @@ EXPORT_SYMBOL(dcache_dir_fsync); - EXPORT_SYMBOL(dcache_readdir); - EXPORT_SYMBOL(dcache_dir_ops); +--- linux-2.4.18-18/kernel/ksyms.c~exports Sat Apr 5 02:51:27 2003 ++++ linux-2.4.18-18-braam/kernel/ksyms.c Sat Apr 5 02:54:29 2003 +@@ -306,6 +306,11 @@ EXPORT_SYMBOL_GPL(buffermem_pages); + EXPORT_SYMBOL_GPL(nr_free_pages); + EXPORT_SYMBOL_GPL(page_cache_size); +/* lustre */ +EXPORT_SYMBOL(panic_notifier_list); diff --git a/lustre/kernel_patches/patches/exports_hp.patch b/lustre/kernel_patches/patches/exports_hp.patch index 5adba64..b6bba38 100644 --- a/lustre/kernel_patches/patches/exports_hp.patch +++ b/lustre/kernel_patches/patches/exports_hp.patch @@ -1,25 +1,28 @@ - fs/ext3/Makefile | 2 ++ + fs/ext3/Makefile | 4 +++- fs/ext3/super.c | 2 +- include/linux/fs.h | 1 + - kernel/ksyms.c | 4 ++++ - 4 files changed, 8 insertions(+), 1 deletion(-) + kernel/ksyms.c | 5 +++++ + 4 files changed, 10 insertions(+), 2 deletions(-) ---- linux-2.4.20-hp4_pnnl1/fs/ext3/Makefile~exports_hp Tue Apr 1 20:36:07 2003 -+++ linux-2.4.20-hp4_pnnl1-braam/fs/ext3/Makefile Tue Apr 1 20:36:07 2003 -@@ -9,6 +9,8 @@ +--- linux-2.4.20/fs/ext3/Makefile~exports_hp Sat Apr 5 03:55:19 2003 ++++ linux-2.4.20-braam/fs/ext3/Makefile Sat Apr 5 03:56:03 2003 +@@ -9,8 +9,10 @@ O_TARGET := ext3.o -+export-objs := super.o ++export-objs := super.o inode.o + obj-y := balloc.o bitmap.o dir.o file.o fsync.o ialloc.o inode.o \ - ioctl.o namei.o super.o symlink.o +- ioctl.o namei.o super.o symlink.o ++ ioctl.o namei.o super.o symlink.o obj-m := $(O_TARGET) ---- linux-2.4.20-hp4_pnnl1/fs/ext3/super.c~exports_hp Tue Apr 1 20:36:07 2003 -+++ linux-2.4.20-hp4_pnnl1-braam/fs/ext3/super.c Tue Apr 1 20:36:07 2003 + + include $(TOPDIR)/Rules.make +--- linux-2.4.20/fs/ext3/super.c~exports_hp Sat Apr 5 03:55:19 2003 ++++ linux-2.4.20-braam/fs/ext3/super.c Sat Apr 5 03:55:19 2003 @@ -1769,7 +1769,7 @@ static void __exit exit_ext3_fs(void) unregister_filesystem(&ext3_fs_type); } @@ -29,9 +32,9 @@ MODULE_AUTHOR("Remy Card, Stephen Tweedie, Andrew Morton, Andreas Dilger, Theodore Ts'o and others"); MODULE_DESCRIPTION("Second Extended Filesystem with journaling extensions"); ---- linux-2.4.20-hp4_pnnl1/include/linux/fs.h~exports_hp Tue Apr 1 20:36:07 2003 -+++ linux-2.4.20-hp4_pnnl1-braam/include/linux/fs.h Tue Apr 1 20:36:52 2003 -@@ -1020,6 +1020,7 @@ extern int unregister_filesystem(struct +--- linux-2.4.20/include/linux/fs.h~exports_hp Sat Apr 5 03:55:19 2003 ++++ linux-2.4.20-braam/include/linux/fs.h Sat Apr 5 03:55:19 2003 +@@ -1005,6 +1005,7 @@ extern int unregister_filesystem(struct 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 *); @@ -39,14 +42,15 @@ #define kern_umount mntput ---- linux-2.4.20-hp4_pnnl1/kernel/ksyms.c~exports_hp Tue Apr 1 20:36:07 2003 -+++ linux-2.4.20-hp4_pnnl1-braam/kernel/ksyms.c Tue Apr 1 20:36:07 2003 -@@ -308,6 +308,10 @@ EXPORT_SYMBOL(dcache_dir_fsync); +--- linux-2.4.20/kernel/ksyms.c~exports_hp Sat Apr 5 03:55:19 2003 ++++ linux-2.4.20-braam/kernel/ksyms.c Sat Apr 5 03:55:19 2003 +@@ -284,6 +284,11 @@ EXPORT_SYMBOL(dcache_dir_fsync); EXPORT_SYMBOL(dcache_readdir); EXPORT_SYMBOL(dcache_dir_ops); +/* lustre */ +EXPORT_SYMBOL(pagecache_lock_cacheline); ++EXPORT_SYMBOL(panic_notifier_list); +EXPORT_SYMBOL(do_kern_mount); + /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */