diff options
| author |   Nikita Danilov <nikita@clusterfs.com> | 2005-09-06 15:17:20 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 16:57:28 -0700 |
| commit | 4b0dc07e66ade18e0209331afbd16b3de8384f5c (patch) | |
| tree | f00b0b3e4649ffcbcf1ff26c08ee28371a857c89 /drivers/block/deadline-iosched.c | |
| parent | [PATCH] Add rdinit parameter to pick early userspace init (diff) | |
| download | linux-dev-4b0dc07e66ade18e0209331afbd16b3de8384f5c.tar.xz linux-dev-4b0dc07e66ade18e0209331afbd16b3de8384f5c.zip | |
[PATCH] cleanup of deadline_dispatch_requests()
cleanup of deadline_dispatch_requests():
- replace drq selection with hopefully clearer while semantically the
same construct: take write request, if there is any, otherwise take read
one, or NULL if none exist.
- kill unused other_dir.
Signed-off-by: Nikita Danilov <nikita@clusterfs.com>
Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/deadline-iosched.c')
| -rw-r--r-- | drivers/block/deadline-iosched.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c index ff5201e02153..24594c57c323 100644 --- a/drivers/block/deadline-iosched.c +++ b/drivers/block/deadline-iosched.c @@ -507,18 +507,12 @@ static int deadline_dispatch_requests(struct deadline_data *dd) const int reads = !list_empty(&dd->fifo_list[READ]); const int writes = !list_empty(&dd->fifo_list[WRITE]); struct deadline_rq *drq; - int data_dir, other_dir; + int data_dir; /* * batches are currently reads XOR writes */ - drq = NULL; - - if (dd->next_drq[READ]) - drq = dd->next_drq[READ]; - - if (dd->next_drq[WRITE]) - drq = dd->next_drq[WRITE]; + drq = dd->next_drq[WRITE] ? : dd->next_drq[READ]; if (drq) { /* we have a "next request" */ @@ -544,7 +538,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd) goto dispatch_writes; data_dir = READ; - other_dir = WRITE; goto dispatch_find_request; } @@ -560,7 +553,6 @@ dispatch_writes: dd->starved = 0; data_dir = WRITE; - other_dir = READ; goto dispatch_find_request; } |