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

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

[PATCH] Fix on-the-fly switch from cfq i/o scheduler 



Don't clear ->elevator_data on exit, if we are switching queues we are
overwriting the data of the new io scheduler.

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

drivers/block/cfq-iosched.c

+1 −3
Original line number Diff line number Diff line
@@ -2059,10 +2059,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;

	blk_put_queue(q);



	mempool_destroy(cfqd->crq_pool);

	kfree(cfqd->crq_hash);