lustre/kernel_patches/patches/elevator-cfq.patch

   1 Index: linux-2.6.5-SLES9_SP1_BRANCH_2004111114454891/drivers/block/ll_rw_blk.c
   2 ===================================================================
   3 --- linux-2.6.5-SLES9_SP1_BRANCH_2004111114454891.orig/drivers/block/ll_rw_blk.c        2005-06-28 01:53:39.000000000 -0600
   4 +++ linux-2.6.5-SLES9_SP1_BRANCH_2004111114454891/drivers/block/ll_rw_blk.c     2005-06-28 01:58:45.000000000 -0600
   5 @@ -1380,12 +1380,12 @@
   6  static int __make_request(request_queue_t *, struct bio *);
   7
   8  static elevator_t *chosen_elevator =
   9 -#if defined(CONFIG_IOSCHED_AS)
  10 +#if defined(CONFIG_IOSCHED_CFQ)
  11 +       &iosched_cfq;
  12 +#elif defined(CONFIG_IOSCHED_AS)
  13         &iosched_as;
  14  #elif defined(CONFIG_IOSCHED_DEADLINE)
  15         &iosched_deadline;
  16 -#elif defined(CONFIG_IOSCHED_CFQ)
  17 -       &iosched_cfq;
  18  #elif defined(CONFIG_IOSCHED_NOOP)
  19         &elevator_noop;
  20  #else