aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2006-08-21 08:36:12 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-08-21 10:02:54 +0200
commitbe33c3a67bb717508ab1eab0f2fa570fabcbc4d2 (patch)
treea3ed181d91d97487b5918a8e8c4eab05166978f1
parente014ff8d4285b81f0de0719d8eee72bc50bfd4be (diff)
downloadkernel_samsung_espresso10-be33c3a67bb717508ab1eab0f2fa570fabcbc4d2.zip
kernel_samsung_espresso10-be33c3a67bb717508ab1eab0f2fa570fabcbc4d2.tar.gz
kernel_samsung_espresso10-be33c3a67bb717508ab1eab0f2fa570fabcbc4d2.tar.bz2
[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>
-rw-r--r--block/cfq-iosched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index aae3123..3a3aee0 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -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;
}