diff options
| author | Tejun Heo <tj@kernel.org> | 2011-12-14 00:33:41 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-12-14 00:33:41 +0100 |
| commit | a612fddf0d8090f2877305c9168b6c1a34fb5d90 (patch) | |
| tree | b59047a1670469362e1ea44093522224bdcf5aae /block/elevator.c | |
| parent | c58698073218f2c8f2fc5982fa3938c2d3803b9f (diff) | |
| download | linux-a612fddf0d8090f2877305c9168b6c1a34fb5d90.tar.gz linux-a612fddf0d8090f2877305c9168b6c1a34fb5d90.tar.bz2 linux-a612fddf0d8090f2877305c9168b6c1a34fb5d90.zip | |
block, cfq: move cfqd->icq_list to request_queue and add request->elv.icq
Most of icq management is about to be moved out of cfq into blk-ioc.
This patch prepares for it.
* Move cfqd->icq_list to request_queue->icq_list
* Make request explicitly point to icq instead of through elevator
private data. ->elevator_private[3] is replaced with sub struct elv
which contains icq pointer and priv[2]. cfq is updated accordingly.
* Meaningless clearing of ->elevator_private[0] removed from
elv_set_request(). At that point in code, the field was guaranteed
to be %NULL anyway.
This patch doesn't introduce any functional change.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 31ffe76aed3d..c5c6214829cb 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -745,8 +745,6 @@ int elv_set_request(struct request_queue *q, struct request *rq, gfp_t gfp_mask) if (e->type->ops.elevator_set_req_fn) return e->type->ops.elevator_set_req_fn(q, rq, gfp_mask); - - rq->elevator_private[0] = NULL; return 0; } |