From 6fea8d1f74a26602a264ceee94ff229015d93bf9 Mon Sep 17 00:00:00 2001 From: adilger Date: Mon, 3 Feb 2003 18:31:10 +0000 Subject: [PATCH] Update kernel patches for hp kernel. --- lustre/kernel_patches/patches/exports_hp.patch | 56 ++++++++++++++++++++++ .../patches/kmem_cache_validate_hp.patch | 18 +------ lustre/kernel_patches/pc/exports_hp.pc | 4 ++ lustre/kernel_patches/series/hp-pnnl | 2 +- lustre/kernel_patches/txt/exports_hp.txt | 3 ++ 5 files changed, 65 insertions(+), 18 deletions(-) create mode 100644 lustre/kernel_patches/patches/exports_hp.patch create mode 100644 lustre/kernel_patches/pc/exports_hp.pc create mode 100644 lustre/kernel_patches/txt/exports_hp.txt diff --git a/lustre/kernel_patches/patches/exports_hp.patch b/lustre/kernel_patches/patches/exports_hp.patch new file mode 100644 index 0000000..0222b46 --- /dev/null +++ b/lustre/kernel_patches/patches/exports_hp.patch @@ -0,0 +1,56 @@ + + + + fs/ext3/Makefile | 2 ++ + fs/ext3/super.c | 2 +- + include/linux/fs.h | 1 + + kernel/ksyms.c | 4 ++++ + 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 +@@ -9,6 +9,8 @@ + + O_TARGET := ext3.o + ++export-objs := super.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) + unregister_filesystem(&ext3_fs_type); + } + +-EXPORT_NO_SYMBOLS; ++EXPORT_SYMBOL(ext3_bread); + + 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 + 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 *); ++struct vfsmount *do_kern_mount(const char *type, int flags, char *name, void *data); + 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,10 @@ EXPORT_SYMBOL(dcache_dir_fsync); + EXPORT_SYMBOL(dcache_readdir); + EXPORT_SYMBOL(dcache_dir_ops); + ++/* lustre */ ++EXPORT_SYMBOL(pagecache_lock_cacheline); ++EXPORT_SYMBOL(do_kern_mount); ++ + /* for stackable file systems (lofs, wrapfs, cryptfs, etc.) */ + EXPORT_SYMBOL(default_llseek); + EXPORT_SYMBOL(dentry_open); + +_ diff --git a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch index e226466..03385a7 100644 --- a/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch +++ b/lustre/kernel_patches/patches/kmem_cache_validate_hp.patch @@ -1,25 +1,9 @@ - arch/i386/mm/init.c | 6 +++++ arch/ia64/mm/init.c | 6 +++++ include/linux/slab.h | 1 kernel/ksyms.c | 1 mm/slab.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 67 insertions(+) + 4 files changed, 61 insertions(+) ---- linux-2.4.19-hp2_pnnl2/arch/i386/mm/init.c~kmem_cache_validate_hp Sun Jan 19 18:59:23 2003 -+++ linux-2.4.19-hp2_pnnl2-root/arch/i386/mm/init.c Sun Jan 19 18:59:24 2003 -@@ -43,6 +43,12 @@ unsigned long highstart_pfn, highend_pfn - static unsigned long totalram_pages; - static unsigned long totalhigh_pages; - -+struct page *check_get_page(unsigned long kaddr) -+{ -+#warning FIXME: Lustre team, is this solid? -+ return virt_to_page(kaddr); -+} -+ - int do_check_pgt_cache(int low, int high) - { - int freed = 0; --- linux-2.4.19-hp2_pnnl2/arch/ia64/mm/init.c~kmem_cache_validate_hp Sun Jan 19 18:59:23 2003 +++ linux-2.4.19-hp2_pnnl2-root/arch/ia64/mm/init.c Sun Jan 19 18:59:24 2003 @@ -44,6 +44,12 @@ unsigned long vmalloc_end = VMALLOC_END_ diff --git a/lustre/kernel_patches/pc/exports_hp.pc b/lustre/kernel_patches/pc/exports_hp.pc new file mode 100644 index 0000000..6472a11 --- /dev/null +++ b/lustre/kernel_patches/pc/exports_hp.pc @@ -0,0 +1,4 @@ +fs/ext3/Makefile +fs/ext3/super.c +include/linux/fs.h +kernel/ksyms.c diff --git a/lustre/kernel_patches/series/hp-pnnl b/lustre/kernel_patches/series/hp-pnnl index dd3fe11..c3d33c5 100644 --- a/lustre/kernel_patches/series/hp-pnnl +++ b/lustre/kernel_patches/series/hp-pnnl @@ -1,5 +1,5 @@ dev_read_only_hp.patch -exports.patch +exports_hp.patch kmem_cache_validate_hp.patch jbd-transno-cb.patch lustre_version.patch diff --git a/lustre/kernel_patches/txt/exports_hp.txt b/lustre/kernel_patches/txt/exports_hp.txt new file mode 100644 index 0000000..00b991e --- /dev/null +++ b/lustre/kernel_patches/txt/exports_hp.txt @@ -0,0 +1,3 @@ +DESC +Required kernel function exports for Lustre. +EDESC -- 1.8.3.1