Commit be33c3a6 authored Aug 21, 2006 by Oleg Nesterov Committed by Jens Axboe Aug 21, 2006

[PATCH] cfq_cic_link: fix usage of wrong cfq_io_context



Obviously, cfq_cic_link() shouldn't free a just allocated cfq_io_context?
The dead key is from __cic, so drop that.

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jens Axboe <axboe@suse.de>

parent e014ff8d

block/cfq-iosched.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1561,7 +1561,7 @@ restart:
		/* ->key must be copied to avoid race with cfq_exit_queue() */
		k = __cic->key;
		if (unlikely(!k)) {
		cfq_drop_dead_cic(ioc, cic);
		cfq_drop_dead_cic(ioc, __cic);
		goto restart;
		}

Admin message