From 433910f8d0a958569018b335ec853e50033bd768 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 18 Mar 2006 12:29:52 -0500
Subject: [PATCH] --- yaml --- r: 21126 b: refs/heads/master c:
 1cc9be68ebcc1de9904bf225441613878da9c0d8 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/block/cfq-iosched.c | 16 ++--------------
 2 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 4b47d815bcf7..ad6aba919c7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a90d742e4cbbc217c402265eb8b8bb0e0f9f8da2
+refs/heads/master: 1cc9be68ebcc1de9904bf225441613878da9c0d8
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 9af4044dad5e..d1f2ae1629f7 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -6,21 +6,13 @@
  *
  *  Copyright (C) 2003 Jens Axboe <axboe@suse.de>
  */
-#include <linux/kernel.h>
-#include <linux/fs.h>
-#include <linux/blkdev.h>
-#include <linux/elevator.h>
-#include <linux/bio.h>
 #include <linux/config.h>
 #include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/init.h>
-#include <linux/compiler.h>
+#include <linux/blkdev.h>
+#include <linux/elevator.h>
 #include <linux/hash.h>
 #include <linux/rbtree.h>
-#include <linux/mempool.h>
 #include <linux/ioprio.h>
-#include <linux/writeback.h>
 
 /*
  * tunables
@@ -1258,10 +1250,6 @@ static void cfq_exit_single_io_context(struct cfq_io_context *cic)
 	spin_unlock(q->queue_lock);
 }
 
-/*
- * Another task may update the task cic list, if it is doing a queue lookup
- * on its behalf. cfq_cic_lock excludes such concurrent updates
- */
 static void cfq_exit_io_context(struct cfq_io_context *cic)
 {
 	struct cfq_io_context *__cic;