projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] USB Storage: add support for Maxtor One-Touch button
[powerpc.git]
/
drivers
/
block
/
deadline-iosched.c
diff --git
a/drivers/block/deadline-iosched.c
b/drivers/block/deadline-iosched.c
index
ff5201e
..
24594c5
100644
(file)
--- 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;
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
*/
/*
* 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" */
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;
goto dispatch_writes;
data_dir = READ;
- other_dir = WRITE;
goto dispatch_find_request;
}
goto dispatch_find_request;
}
@@
-560,7
+553,6
@@
dispatch_writes:
dd->starved = 0;
data_dir = WRITE;
dd->starved = 0;
data_dir = WRITE;
- other_dir = READ;
goto dispatch_find_request;
}
goto dispatch_find_request;
}