Re: [PATCH 1/1] block: CFQ refcounting fix

From: Jens Axboe
Date: Wed Aug 31 2005 - 10:51:18 EST


On Wed, Aug 31 2005, Brian King wrote:
> diff -puN drivers/block/cfq-iosched.c~cfq_refcnt_fix drivers/block/cfq-iosched.c
> --- linux-2.6/drivers/block/cfq-iosched.c~cfq_refcnt_fix 2005-08-30 17:26:55.000000000 -0500
> +++ linux-2.6-bjking1/drivers/block/cfq-iosched.c 2005-08-31 08:48:30.000000000 -0500
> @@ -2260,8 +2260,6 @@ static void cfq_put_cfqd(struct cfq_data
> if (!atomic_dec_and_test(&cfqd->ref))
> return;
>
> - blk_put_queue(q);
> -
> cfq_shutdown_timer_wq(cfqd);
> q->elevator->elevator_data = NULL;
>
> @@ -2318,7 +2316,6 @@ static int cfq_init_queue(request_queue_
> e->elevator_data = cfqd;
>
> cfqd->queue = q;
> - atomic_inc(&q->refcnt);
>
> cfqd->max_queued = q->nr_requests / 4;
> q->nr_batching = cfq_queued;
> _

That looks better. I'll add this to my outgoing queue, thanks!

--
Jens Axboe

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/