Index: linux-2.6.14/drivers/block/elevator.c
===================================================================
--- linux-2.6.14.orig/drivers/block/elevator.c 2005-11-07 08:07:15.000000000 -0800
+++ linux-2.6.14/drivers/block/elevator.c 2005-11-08 02:14:35.727328656 -0800
@@ -155,9 +155,10 @@
/*
* If the given scheduler is not available, fall back to no-op.
*/
- if (!(e = elevator_find(chosen_elevator)))
+ if ((e = elevator_find(chosen_elevator)))
+ elevator_put(e);
+ else
strcpy(chosen_elevator, "noop");
- elevator_put(e);
}
static int __init elevator_setup(char *str)
On Tue, Nov 08 2005, Zachary Amsden wrote:
> [email protected] wrote:
>
> >The patch titled
> >
> > Elevator init fixes
> >
> >has been added to the -mm tree. Its filename is
> >
> > elevator-init-fixes.patch
> >
> >
>
> In addition to the first patch, which is probably goodness, I found the
> cause of my panic - applying this patch fixes it and now I am booting.
I'm guessing you hit the same problem as Marcelo, not configuring the
chosen io scheduler as builtin?
But both patches look fine, I've applied them to the 'for-linus' branch
for 2.6.15. Thanks!
--
Jens Axboe