[Pkg-lustre-svn-commit] updated: [df8458d] Make first part fo the patch apply on 1.6.6 - next part will come soon
Patrick Winnertz
winnie at debian.org
Tue Dec 2 14:54:08 UTC 2008
The following commit has been merged in the master branch:
commit df8458d7f7ff0c0878b7a9114edbd109a7d7dbde
Author: Patrick Winnertz <winnie at debian.org>
Date: Tue Dec 2 15:48:23 2008 +0100
Make first part fo the patch apply on 1.6.6 - next part will come soon
diff --git a/debian/patches/server_support_2.6.27.dpatch b/debian/patches/server_support_2.6.27.dpatch
index 7646a87..15d2f62 100755
--- a/debian/patches/server_support_2.6.27.dpatch
+++ b/debian/patches/server_support_2.6.27.dpatch
@@ -5,132 +5,25 @@
## DP: Patch which will enable server support for 2.6.27er kernels, Taken from #15976
@DPATCH@
---- ./lustre/lustre/kernel_patches/patches/8kstack-2.6.12.patch 2008-11-26 20:54:45.000000000 +0800
-+++ ./lustre/lustre/kernel_patches/patches/8kstack-2.6.27.patch 2008-11-10 15:54:21.000000000 +0800
-@@ -1,16 +1,13 @@
--Increase the stack size to 8kB. This is only required for i386 arch,
--because other kernels always have 8kB stack sizes.
--
- Index: linux-2.6.9-5.0.3.EL/include/asm-i386/thread_info.h
- ===================================================================
----- linux-2.6.9-5.0.3.EL.orig/include/asm-i386/thread_info.h 2005-02-25 10:25:33.000000000 +0200
--+++ linux-2.6.9-5.0.3.EL/include/asm-i386/thread_info.h 2005-02-25 20:19:11.676139032 +0200
--@@ -54,7 +54,7 @@
+diff -urNad lustre~/lustre/kernel_patches/patches/8kstack-2.6.27.patch lustre/lustre/kernel_patches/patches/8kstack-2.6.27.patch
+--- lustre~/lustre/kernel_patches/patches/8kstack-2.6.27.patch 1970-01-01 00:00:00.000000000 +0000
++++ lustre/lustre/kernel_patches/patches/8kstack-2.6.27.patch 2008-12-02 15:41:57.000000000 +0100
+@@ -0,0 +1,11 @@
+--- linux-2.6.9-5.0.3.EL.orig/include/asm-x86/page_32.h 2005-02-25 10:25:33.000000000 +0200
++++ linux-2.6.9-5.0.3.EL/include/asm-x86/page_32.h 2005-02-25 20:19:11.676139032 +0200
+@@ -14,7 +14,7 @@
+ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL)
-
-- #define PREEMPT_ACTIVE 0x10000000
- #ifdef CONFIG_4KSTACKS
---#define THREAD_SIZE (4096)
--+#define THREAD_SIZE (8192)
++
++ #ifdef CONFIG_4KSTACKS
+-#define THREAD_ORDER 0
++#define THREAD_ORDER 1
- #else
-- #define THREAD_SIZE (8192)
++ #else
+ #define THREAD_ORDER 1
- #endif
---- ./lustre/lustre/kernel_patches/patches/dev_read_only-2.6.22-vanilla.patch 2008-11-26 20:54:45.000000000 +0800
-+++ ./lustre/lustre/kernel_patches/patches/dev_read_only-2.6.27-vanilla.patch 2008-11-25 17:20:01.000000000 +0800
-@@ -1,14 +1,6 @@
--Set the underlying block device "read only" and silently discard writes
--to the device at the block layer. This allows the block device queue
--to drain quickly for controlled failback of the device.
--
--At one time it was required to avoid crashes in the JBD layer during
--failover, but it may also be possible to just allow the inflight IO to
--complete and have Lustre handle this more gracefully.
--
- diff -urp linux-2.6.18.1.orig/block/ll_rw_blk.c linux-2.6.18.1/block/ll_rw_blk.c
----- linux-2.6.18.1.orig/block/ll_rw_blk.c 2006-10-14 06:34:03.000000000 +0300
--+++ linux-2.6.18.1/block/ll_rw_blk.c 2007-05-29 14:50:46.000000000 +0300
-+--- linux-2.6.18.1.orig/block/blk-core.c 2006-10-14 06:34:03.000000000 +0300
-++++ linux-2.6.18.1/block/blk-core.c 2007-05-29 14:50:46.000000000 +0300
- @@ -2993,6 +2993,8 @@ static void handle_bad_sector(struct bio
- set_bit(BIO_EOF, &bio->bi_flags);
- }
-@@ -25,16 +17,16 @@ diff -urp linux-2.6.18.1.orig/block/ll_r
- + /* this is cfs's dev_rdonly check */
- + if (bio->bi_rw == WRITE &&
- + dev_check_rdonly(bio->bi_bdev)) {
--+ bio_endio(bio, bio->bi_size, 0);
-++ bio_endio(bio, bio->bi_size);
- + break;
- + }
-
- /*
- * If this device has partitions, remap block n
- @@ -3675,6 +3683,91 @@ void swap_io_context(struct io_context *
-- *ioc2 = temp;
- }
-- EXPORT_SYMBOL(swap_io_context);
-+ EXPORT_SYMBOL(kblockd_flush_work);
-+
- + /*
- + * Debug code for turning block devices "read-only" (will discard writes
- + * silently). This is for filesystem crash/recovery testing.
-@@ -120,9 +112,9 @@ diff -urp linux-2.6.18.1.orig/block/ll_r
- +EXPORT_SYMBOL(dev_set_rdonly);
- +EXPORT_SYMBOL(dev_clear_rdonly);
- +EXPORT_SYMBOL(dev_check_rdonly);
--
-- /*
-- * sysfs parts below
-+ int __init blk_dev_init(void)
-+ {
-+ int i;
- diff -urp linux-2.6.18.1.orig/fs/block_dev.c linux-2.6.18.1/fs/block_dev.c
- --- linux-2.6.18.1.orig/fs/block_dev.c 2006-10-14 06:34:03.000000000 +0300
- +++ linux-2.6.18.1/fs/block_dev.c 2007-05-29 14:53:38.000000000 +0300
---- ./lustre/lustre/kernel_patches/patches/export-show_task-2.6.18-vanilla.patch 2008-11-26 20:54:46.000000000 +0800
-+++ ./lustre/lustre/kernel_patches/patches/export-show_task-2.6.27-vanilla.patch 2008-11-10 15:54:57.000000000 +0800
-@@ -1,30 +1,12 @@
--Export the show_task() function in order to get better process stacks.
--It will also print the current process stack, which is useful.
--
--This is a nice-to-have but not required for Lustre to work.
--
- Index: linux-2.6/kernel/sched.c
- ===================================================================
- --- linux-2.6.orig/kernel/sched.c 2006-07-15 11:51:46.000000000 +0800
- +++ linux-2.6/kernel/sched.c 2006-07-15 16:24:35.000000000 +0800
--@@ -4652,7 +4652,7 @@ static inline struct task_struct *younge
-+@@ -4652,6 +4652,7 @@
-
-- static const char stat_nam[] = "RSDTtZX";
--
---static void show_task(struct task_struct *p)
--+void show_task(struct task_struct *p)
-- {
-- struct task_struct *relative;
-- unsigned long free = 0;
--@@ -4698,9 +4698,10 @@ static void show_task(struct task_struct
-- else
-- printk(" (NOTLB)\n");
--
--- if (state != TASK_RUNNING)
--+ if (state != TASK_RUNNING || p == current)
-- show_stack(p, NULL);
-+ show_stack(p, NULL);
- }
--+EXPORT_SYMBOL(show_task);
-++EXPORT_SYMBOL(sched_show_task);
-
-- void show_state(void)
-+ void show_state_filter(unsigned long state_filter)
- {
---- ./lustre/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch 2008-11-26 20:54:47.000000000 +0800
-+++ ./lustre/lustre/kernel_patches/patches/sd_iostats-2.6.27-vanilla.patch 2008-11-25 21:16:09.000000000 +0800
-@@ -1,7 +1,3 @@
--Export more statistics from the SCSI layer.
--
--A nice to have patch, but not required for Lustre to work.
--
- Index: linux-2.6.22.19/drivers/scsi/Kconfig
- ===================================================================
- --- linux-2.6.22.19.orig/drivers/scsi/Kconfig
-@@ -73,13 +69,13 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
++ #endif
+diff -urNad lustre~/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch lustre/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch
+--- lustre~/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch 2008-11-25 13:59:37.000000000 +0100
++++ lustre/lustre/kernel_patches/patches/sd_iostats-2.6.22-vanilla.patch 2008-12-02 15:40:00.000000000 +0100
+@@ -69,13 +69,13 @@
/*
* This indicates that the command is ready from our end to be
* queued.
@@ -147,7 +40,7 @@
@@ -1666,6 +1687,36 @@ static int sd_probe(struct device *dev)
if (sdp->removable)
-@@ -428,7 +424,7 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
+@@ -424,7 +424,7 @@
+ if (stats == NULL)
+ return;
+
@@ -156,7 +49,7 @@
+ for (bucket = 0, tmp = nsect; tmp > 1; bucket++)
+ tmp >>= 1;
+
-@@ -522,8 +518,8 @@ Index: linux-2.6.22.19/drivers/scsi/sd.c
+@@ -518,8 +518,8 @@
Index: linux-2.6.22.19/include/scsi/sd.h
===================================================================
@@ -167,8 +60,9 @@
@@ -31,6 +31,46 @@
*/
#define SD_BUF_SIZE 512
---- /dev/null 2008-11-26 19:39:44.275003284 +0800
-+++ ./lustre/lustre/kernel_patches/series/2.6.27-vanilla.series 2008-11-25 14:52:30.000000000 +0800
+diff -urNad lustre~/lustre/kernel_patches/series/2.6.27-vanilla.series lustre/lustre/kernel_patches/series/2.6.27-vanilla.series
+--- lustre~/lustre/kernel_patches/series/2.6.27-vanilla.series 1970-01-01 00:00:00.000000000 +0000
++++ lustre/lustre/kernel_patches/series/2.6.27-vanilla.series 2008-12-02 15:40:00.000000000 +0100
@@ -0,0 +1,12 @@
+lustre_version.patch
+vfs_races-2.6.22-vanilla.patch
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list