diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 9af4044dad5e..d1f2ae1629f7 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -6,21 +6,13 @@ | |||
6 | * | 6 | * |
7 | * Copyright (C) 2003 Jens Axboe <axboe@suse.de> | 7 | * Copyright (C) 2003 Jens Axboe <axboe@suse.de> |
8 | */ | 8 | */ |
9 | #include <linux/kernel.h> | ||
10 | #include <linux/fs.h> | ||
11 | #include <linux/blkdev.h> | ||
12 | #include <linux/elevator.h> | ||
13 | #include <linux/bio.h> | ||
14 | #include <linux/config.h> | 9 | #include <linux/config.h> |
15 | #include <linux/module.h> | 10 | #include <linux/module.h> |
16 | #include <linux/slab.h> | 11 | #include <linux/blkdev.h> |
17 | #include <linux/init.h> | 12 | #include <linux/elevator.h> |
18 | #include <linux/compiler.h> | ||
19 | #include <linux/hash.h> | 13 | #include <linux/hash.h> |
20 | #include <linux/rbtree.h> | 14 | #include <linux/rbtree.h> |
21 | #include <linux/mempool.h> | ||
22 | #include <linux/ioprio.h> | 15 | #include <linux/ioprio.h> |
23 | #include <linux/writeback.h> | ||
24 | 16 | ||
25 | /* | 17 | /* |
26 | * tunables | 18 | * tunables |
@@ -1258,10 +1250,6 @@ static void cfq_exit_single_io_context(struct cfq_io_context *cic) | |||
1258 | spin_unlock(q->queue_lock); | 1250 | spin_unlock(q->queue_lock); |
1259 | } | 1251 | } |
1260 | 1252 | ||
1261 | /* | ||
1262 | * Another task may update the task cic list, if it is doing a queue lookup | ||
1263 | * on its behalf. cfq_cic_lock excludes such concurrent updates | ||
1264 | */ | ||
1265 | static void cfq_exit_io_context(struct cfq_io_context *cic) | 1253 | static void cfq_exit_io_context(struct cfq_io_context *cic) |
1266 | { | 1254 | { |
1267 | struct cfq_io_context *__cic; | 1255 | struct cfq_io_context *__cic; |