Branch b1_4

Add a patch (not in 2.6.5 series yet) which makes cfq default IO scheduler.
b=6405

diff --git a/lustre/kernel_patches/patches/elevator-cfq.patch b/lustre/kernel_patches/patches/elevator-cfq.patch
new file mode 100644 (file)
index 0000000..a13194e
--- /dev/null
+++ b/lustre/kernel_patches/patches/elevator-cfq.patch
@@ -0,0 +1,20 @@
+Index: linux-2.6.5-SLES9_SP1_BRANCH_2004111114454891/drivers/block/ll_rw_blk.c
+===================================================================
+--- linux-2.6.5-SLES9_SP1_BRANCH_2004111114454891.orig/drivers/block/ll_rw_blk.c       2005-06-28 01:53:39.000000000 -0600
++++ linux-2.6.5-SLES9_SP1_BRANCH_2004111114454891/drivers/block/ll_rw_blk.c    2005-06-28 01:58:45.000000000 -0600
+@@ -1380,12 +1380,12 @@
+ static int __make_request(request_queue_t *, struct bio *);
+ 
+ static elevator_t *chosen_elevator =
+-#if defined(CONFIG_IOSCHED_AS)
++#if defined(CONFIG_IOSCHED_CFQ)
++      &iosched_cfq;
++#elif defined(CONFIG_IOSCHED_AS)
+       &iosched_as;
+ #elif defined(CONFIG_IOSCHED_DEADLINE)
+       &iosched_deadline;
+-#elif defined(CONFIG_IOSCHED_CFQ)
+-      &iosched_cfq;
+ #elif defined(CONFIG_IOSCHED_NOOP)
+       &elevator_noop;
+ #else