From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Mon, 21 Aug 2006 06:36:12 +0000 (+0200)
Subject: [PATCH] cfq_cic_link: fix usage of wrong cfq_io_context
X-Git-Tag: v2.6.18-rc5~74^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be33c3a67bb717508ab1eab0f2fa570fabcbc4d2;p=linux-2.6

[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>
---

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index aae3123bf3..3a3aee08ec 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;
 		}