Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35797132 authored by Jens Axboe's avatar Jens Axboe Committed by Linus Torvalds
Browse files

[PATCH] cfq-iosched: reverse bad reference count fix 



The reference count fix merged isn't fully bug free. It doesn't leak
now, but instead it crashes due to looking at freed memory. So for now,
lets reverse the change and I'll fix it for real next week.

Signed-off-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 31139971

drivers/block/cfq-iosched.c

+3 −0
Original line number Diff line number Diff line
@@ -2260,6 +2260,8 @@ static void cfq_put_cfqd(struct cfq_data *cfqd) 
	if (!atomic_dec_and_test(&cfqd->ref))

		return;



	blk_put_queue(q);



	cfq_shutdown_timer_wq(cfqd);

	q->elevator->elevator_data = NULL;
@@ -2316,6 +2318,7 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e) 
	e->elevator_data = cfqd;



	cfqd->queue = q;

	atomic_inc(&q->refcnt);



	cfqd->max_queued = q->nr_requests / 4;

	q->nr_batching = cfq_queued;