From 300b88eabffda7096f7bc99d734102d5f4d34a23 Mon Sep 17 00:00:00 2001 From: adilger Date: Tue, 28 Jun 2005 19:09:25 +0000 Subject: [PATCH] Branch b1_4 Merge suse-2.4.21-cray kernel patch changes from b_cray. b=6927 --- .../patches/export-show_task-2.4-cray.patch | 33 +++++++++ .../patches/ext3-extents-2.4.21-suse2.patch | 14 ++-- .../grab_cache_page_nowait_gfp-2.4.21-suse2.patch | 85 ++++++++++++++++++++++ lustre/kernel_patches/patches/qsnet-suse-2.6.patch | 12 +-- lustre/kernel_patches/series/suse-2.4.21-cray | 5 ++ 5 files changed, 136 insertions(+), 13 deletions(-) create mode 100644 lustre/kernel_patches/patches/export-show_task-2.4-cray.patch create mode 100644 lustre/kernel_patches/patches/grab_cache_page_nowait_gfp-2.4.21-suse2.patch diff --git a/lustre/kernel_patches/patches/export-show_task-2.4-cray.patch b/lustre/kernel_patches/patches/export-show_task-2.4-cray.patch new file mode 100644 index 0000000..8211401 --- /dev/null +++ b/lustre/kernel_patches/patches/export-show_task-2.4-cray.patch @@ -0,0 +1,33 @@ +Index: kernel-l0405/kernel/sched.c +=================================================================== +--- kernel-l0405.orig/kernel/sched.c 2003-11-06 16:15:20.000000000 -0800 ++++ kernel-l0405/kernel/sched.c 2005-04-05 14:44:27.000000000 -0700 +@@ -1627,7 +1627,7 @@ + return retval; + } + +-static void show_task(task_t * p) ++void show_task(task_t * p) + { + unsigned long free = 0; + int state; +Index: kernel-l0405/kernel/ksyms.c +=================================================================== +--- kernel-l0405.orig/kernel/ksyms.c 2005-04-05 14:44:15.000000000 -0700 ++++ kernel-l0405/kernel/ksyms.c 2005-04-05 14:44:50.000000000 -0700 +@@ -55,6 +55,7 @@ + #include + #include + ++extern void show_task(task_t *); + + #if defined(CONFIG_PROC_FS) + #include +@@ -684,6 +685,7 @@ + + /* debug */ + EXPORT_SYMBOL(dump_stack); ++EXPORT_SYMBOL(show_task); + + #if defined(CONFIG_KDB_USB) + #include diff --git a/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch b/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch index 87ac3d1..53cb38e 100644 --- a/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch +++ b/lustre/kernel_patches/patches/ext3-extents-2.4.21-suse2.patch @@ -2461,17 +2461,17 @@ Index: linux-2.4.21-suse2/fs/ext3/Makefile export-objs += xattr.o Index: linux-2.4.21-suse2/fs/ext3/super.c =================================================================== ---- linux-2.4.21-suse2.orig/fs/ext3/super.c 2004-11-02 20:31:37.000000000 +0300 -+++ linux-2.4.21-suse2/fs/ext3/super.c 2004-11-02 20:31:39.000000000 +0300 -@@ -624,6 +624,7 @@ - int i; - +--- linux-2.4.21-suse2.orig/fs/ext3/super.c 2005-04-04 05:44:58.000000000 -0600 ++++ linux-2.4.21-suse2/fs/ext3/super.c 2005-04-04 05:45:43.000000000 -0600 +@@ -532,6 +532,7 @@ + #ifdef EXT3_DELETE_THREAD J_ASSERT(sbi->s_delete_inodes == 0); + #endif + ext3_ext_release(sb); ext3_xattr_put_super(sb); journal_destroy(sbi->s_journal); if (!(sb->s_flags & MS_RDONLY)) { -@@ -829,6 +830,10 @@ +@@ -733,6 +734,10 @@ return 0; } } @@ -2482,7 +2482,7 @@ Index: linux-2.4.21-suse2/fs/ext3/super.c else if (!strcmp (this_char, "grpid") || !strcmp (this_char, "bsdgroups")) set_opt (*mount_options, GRPID); -@@ -1524,6 +1529,8 @@ +@@ -1428,6 +1433,8 @@ test_opt(sb,DATA_FLAGS) == EXT3_MOUNT_ORDERED_DATA ? "ordered": "writeback"); diff --git a/lustre/kernel_patches/patches/grab_cache_page_nowait_gfp-2.4.21-suse2.patch b/lustre/kernel_patches/patches/grab_cache_page_nowait_gfp-2.4.21-suse2.patch new file mode 100644 index 0000000..94c50d0 --- /dev/null +++ b/lustre/kernel_patches/patches/grab_cache_page_nowait_gfp-2.4.21-suse2.patch @@ -0,0 +1,85 @@ +Index: linux-2.4.21-suse2/mm/filemap.c +=================================================================== +--- linux-2.4.21-suse2.orig/mm/filemap.c 2005-04-04 05:58:21.000000000 -0600 ++++ linux-2.4.21-suse2/mm/filemap.c 2005-04-04 06:18:57.000000000 -0600 +@@ -1022,6 +1022,14 @@ + */ + struct page *grab_cache_page_nowait(struct address_space *mapping, unsigned long index) + { ++ return grab_cache_page_nowait_gfp(mapping, index, mapping->gfp_mask); ++} ++ ++ ++struct page *grab_cache_page_nowait_gfp(struct address_space *mapping, ++ unsigned long index, ++ unsigned int gfp_mask) ++{ + struct page *page, **hash; + + hash = page_hash(mapping, index); +@@ -1046,7 +1054,7 @@ + } + } + +- page = page_cache_alloc(mapping); ++ page = alloc_pages(gfp_mask, 0); + if ( unlikely(!page) ) + return NULL; /* Failed to allocate a page */ + +Index: linux-2.4.21-suse2/mm/page_alloc.c +=================================================================== +--- linux-2.4.21-suse2.orig/mm/page_alloc.c 2005-04-04 05:58:04.000000000 -0600 ++++ linux-2.4.21-suse2/mm/page_alloc.c 2005-04-04 06:12:11.000000000 -0600 +@@ -435,7 +435,7 @@ + break; + + min = z->watermarks[class_idx].min; +- if (!(gfp_mask & __GFP_WAIT)) ++ if (!(gfp_mask & __GFP_WAIT) && (gfp_mask & __GFP_HIGH)) + min >>= 2; + else if (current->rt_priority) + min >>= 1; +@@ -504,6 +504,7 @@ + } + + out: ++ if (!(gfp_mask & __GFP_NOWARN)) + printk(KERN_NOTICE "__alloc_pages: %u-order allocation failed (gfp=0x%x/%i)\n", + order, gfp_mask, !!(current->flags & PF_MEMALLOC)); + if (unlikely(vm_gfp_debug)) +Index: linux-2.4.21-suse2/kernel/ksyms.c +=================================================================== +--- linux-2.4.21-suse2.orig/kernel/ksyms.c 2005-04-04 06:01:39.000000000 -0600 ++++ linux-2.4.21-suse2/kernel/ksyms.c 2005-04-04 06:01:43.000000000 -0600 +@@ -326,6 +326,7 @@ + EXPORT_SYMBOL(__find_lock_page); + EXPORT_SYMBOL(find_or_create_page); + EXPORT_SYMBOL(grab_cache_page_nowait); ++EXPORT_SYMBOL(grab_cache_page_nowait_gfp); + EXPORT_SYMBOL(read_cache_page); + EXPORT_SYMBOL(set_page_dirty); + EXPORT_SYMBOL(vfs_readlink); +Index: linux-2.4.21-suse2/include/linux/pagemap.h +=================================================================== +--- linux-2.4.21-suse2.orig/include/linux/pagemap.h 2003-11-10 17:44:33.000000000 -0700 ++++ linux-2.4.21-suse2/include/linux/pagemap.h 2005-04-04 06:01:43.000000000 -0600 +@@ -110,6 +110,7 @@ + + + extern struct page * grab_cache_page_nowait (struct address_space *, unsigned long); ++extern struct page * grab_cache_page_nowait_gfp (struct address_space *, unsigned long, unsigned int); + + typedef int filler_t(void *, struct page*); + +Index: linux-2.4.21-suse2/include/linux/mm.h +=================================================================== +--- linux-2.4.21-suse2.orig/include/linux/mm.h 2005-04-04 05:58:14.000000000 -0600 ++++ linux-2.4.21-suse2/include/linux/mm.h 2005-04-04 06:17:10.000000000 -0600 +@@ -661,6 +661,7 @@ + #define __GFP_IO 0x40 /* Can start low memory physical IO? */ + #define __GFP_HIGHIO 0x80 /* Can start high mem physical IO? */ + #define __GFP_FS 0x100 /* Can call down to low-level FS? */ ++#define __GFP_NOWARN 0x200 /* Don't warn on allocation failure */ + + #define GFP_NOHIGHIO (__GFP_HIGH | __GFP_WAIT | __GFP_IO) + #define GFP_NOIO (__GFP_HIGH | __GFP_WAIT) diff --git a/lustre/kernel_patches/patches/qsnet-suse-2.6.patch b/lustre/kernel_patches/patches/qsnet-suse-2.6.patch index 89f3d5f..d4d9be1 100644 --- a/lustre/kernel_patches/patches/qsnet-suse-2.6.patch +++ b/lustre/kernel_patches/patches/qsnet-suse-2.6.patch @@ -94302,14 +94302,14 @@ Index: linux-2.6.5/kernel/Makefile =================================================================== --- linux-2.6.5.orig/kernel/Makefile 2005-05-11 12:10:11.148128808 -0400 +++ linux-2.6.5/kernel/Makefile 2005-05-11 12:10:12.685895032 -0400 -@@ -30,6 +30,7 @@ +@@ -26,6 +26,7 @@ + obj-$(CONFIG_EVLOG) += evlbuf.o evlapi.o evlposix.o + obj-$(CONFIG_HOOK) += hook.o + obj-$(CONFIG_TRIGEVENT_HOOKS) += trigevent_hooks.o ++obj-$(CONFIG_PTRACK) += ptrack.o + obj-$(CONFIG_LTT) += ltt/ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_CPUSETS) += cpuset.o - obj-$(CONFIG_CKRM_CPU_SCHEDULE) += ckrm_classqueue.o ckrm_sched.o -+obj-$(CONFIG_PTRACK) += ptrack.o - - ifneq ($(CONFIG_IA64),y) - # According to Alan Modra , the -fno-omit-frame-pointer is Index: linux-2.6.5/kernel/ptrack.c =================================================================== --- linux-2.6.5.orig/kernel/ptrack.c 2004-02-23 16:02:56.000000000 -0500 diff --git a/lustre/kernel_patches/series/suse-2.4.21-cray b/lustre/kernel_patches/series/suse-2.4.21-cray index d0e715e..c0187e4 100644 --- a/lustre/kernel_patches/series/suse-2.4.21-cray +++ b/lustre/kernel_patches/series/suse-2.4.21-cray @@ -30,7 +30,12 @@ ext3-xattr-ptr-arith-fix.patch procfs-ndynamic-2.4.21-suse2.patch ext3-truncate-buffer-head.patch loop-sync-2.4.21-suse.patch +inode-max-readahead-2.4.24.patch ext3-extents-2.4.21-suse2.patch ext3-extents-asyncdel-2.4.24.patch +ext3-nlinks-2.4.21-chaos.patch +export-show_task-2.4-cray.patch +grab_cache_page_nowait_gfp-2.4.21-suse2.patch +remove-suid-2.4-rhel.patch fsprivate-2.4-suse.patch nfsd_iallocsem.patch -- 1.8.3.1