openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Nikita Danilov 2005-09-06 15:17:20 -07:00 committed by Linus Torvalds
parent ffdfc40976
commit 4b0dc07e66
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/block/deadline-iosched.c
View File

@ -507,18 +507,12 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
const int reads = !list_empty(&dd->fifo_list[READ]); const int reads = !list_empty(&dd->fifo_list[READ]);
const int writes = !list_empty(&dd->fifo_list[WRITE]); const int writes = !list_empty(&dd->fifo_list[WRITE]);
struct deadline_rq *drq; struct deadline_rq *drq;
int data_dir, other_dir; int data_dir;
/* /*
* batches are currently reads XOR writes * batches are currently reads XOR writes
*/ */
drq = NULL; drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
if (dd->next_drq[READ])
drq = dd->next_drq[READ];
if (dd->next_drq[WRITE])
drq = dd->next_drq[WRITE];
if (drq) { if (drq) {
/* we have a "next request" */ /* we have a "next request" */
@ -544,7 +538,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
goto dispatch_writes; goto dispatch_writes;
data_dir = READ; data_dir = READ;
other_dir = WRITE;
goto dispatch_find_request; goto dispatch_find_request;
} }
@ -560,7 +553,6 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
dd->starved = 0; dd->starved = 0;
data_dir = WRITE; data_dir = WRITE;
other_dir = READ;
goto dispatch_find_request; goto dispatch_find_request;
} }