From 30c8f493564e25827fd75f558d834c1be23faf92 Mon Sep 17 00:00:00 2001 From: braam Date: Wed, 2 Apr 2003 13:12:07 +0000 Subject: [PATCH] update patches for 2.4.20. The HP kernel might well work if we are lucky. the redhat 2.4.20 kernel is next in line --- .../kernel_patches/patches/dev_read_only_hp.patch | 32 +++++++++++----------- lustre/kernel_patches/patches/exports_hp.patch | 22 +++++++-------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lustre/kernel_patches/patches/dev_read_only_hp.patch b/lustre/kernel_patches/patches/dev_read_only_hp.patch index b2cf6f0..ea9fd58 100644 --- a/lustre/kernel_patches/patches/dev_read_only_hp.patch +++ b/lustre/kernel_patches/patches/dev_read_only_hp.patch @@ -1,14 +1,16 @@ - drivers/block/blkpg.c | 38 ++++++++++++++++++++++++++++++++++++++ - drivers/block/loop.c | 5 +++++ - drivers/ide/ide-disk.c | 6 ++++++ - 3 files changed, 49 insertions(+) + drivers/block/blkpg.c | 39 +++++++++++++++++++++++++++++++++++++++ + drivers/block/loop.c | 3 +++ + drivers/ide/ide-disk.c | 4 ++++ + 3 files changed, 46 insertions(+) ---- linux-2.4.19-hp2_pnnl2/drivers/block/blkpg.c~dev_read_only_hp Sun Jan 19 18:51:12 2003 -+++ linux-2.4.19-hp2_pnnl2-root/drivers/block/blkpg.c Sun Jan 19 18:52:28 2003 -@@ -310,6 +310,42 @@ int blk_ioctl(kdev_t dev, unsigned int c +--- linux-2.4.20-hp4_pnnl1/drivers/block/blkpg.c~dev_read_only_hp Tue Apr 1 20:32:00 2003 ++++ linux-2.4.20-hp4_pnnl1-braam/drivers/block/blkpg.c Tue Apr 1 20:34:12 2003 +@@ -296,3 +296,42 @@ int blk_ioctl(kdev_t dev, unsigned int c + } EXPORT_SYMBOL(blk_ioctl); - ++ ++ + +#define NUM_DEV_NO_WRITE 16 +static int dev_no_write[NUM_DEV_NO_WRITE]; @@ -45,11 +47,9 @@ +EXPORT_SYMBOL(dev_check_rdonly); +EXPORT_SYMBOL(dev_clear_rdonly); + - /** - * get_last_sector() - * ---- linux-2.4.19-hp2_pnnl2/drivers/block/loop.c~dev_read_only_hp Sun Jan 19 18:51:12 2003 -+++ linux-2.4.19-hp2_pnnl2-root/drivers/block/loop.c Sun Jan 19 18:51:12 2003 ++ +--- linux-2.4.20-hp4_pnnl1/drivers/block/loop.c~dev_read_only_hp Tue Apr 1 20:32:00 2003 ++++ linux-2.4.20-hp4_pnnl1-braam/drivers/block/loop.c Tue Apr 1 20:32:00 2003 @@ -474,6 +474,9 @@ static int loop_make_request(request_que spin_unlock_irq(&lo->lo_lock); @@ -60,9 +60,9 @@ if (lo->lo_flags & LO_FLAGS_READ_ONLY) goto err; } else if (rw == READA) { ---- linux-2.4.19-hp2_pnnl2/drivers/ide/ide-disk.c~dev_read_only_hp Sun Jan 19 18:51:12 2003 -+++ linux-2.4.19-hp2_pnnl2-root/drivers/ide/ide-disk.c Sun Jan 19 18:51:12 2003 -@@ -551,6 +551,10 @@ static ide_startstop_t lba_48_rw_disk (i +--- linux-2.4.20-hp4_pnnl1/drivers/ide/ide-disk.c~dev_read_only_hp Tue Apr 1 20:32:00 2003 ++++ linux-2.4.20-hp4_pnnl1-braam/drivers/ide/ide-disk.c Tue Apr 1 20:32:00 2003 +@@ -558,6 +558,10 @@ static ide_startstop_t lba_48_rw_disk (i */ static ide_startstop_t do_rw_disk (ide_drive_t *drive, struct request *rq, unsigned long block) { diff --git a/lustre/kernel_patches/patches/exports_hp.patch b/lustre/kernel_patches/patches/exports_hp.patch index 0222b46..5adba64 100644 --- a/lustre/kernel_patches/patches/exports_hp.patch +++ b/lustre/kernel_patches/patches/exports_hp.patch @@ -5,10 +5,10 @@ fs/ext3/super.c | 2 +- include/linux/fs.h | 1 + kernel/ksyms.c | 4 ++++ - 4 files changed, 9 insertions(+), 1 deletion(-) + 4 files changed, 8 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.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 @@ O_TARGET := ext3.o @@ -18,9 +18,9 @@ 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.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 +@@ -1769,7 +1769,7 @@ static void __exit exit_ext3_fs(void) unregister_filesystem(&ext3_fs_type); } @@ -29,18 +29,18 @@ 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 +--- 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 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 + +--- 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); EXPORT_SYMBOL(dcache_readdir); EXPORT_SYMBOL(dcache_dir_ops); -- 1.8.3.1