aboutsummaryrefslogtreecommitdiff
path: root/drivers/block
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2005-09-09 13:02:12 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-09 13:57:33 -0700
commit9d5c1e1bf2b906966609f8cf4a844e61adb86bcd (patch)
treef4248260b6eb657f42050396070fdf799af7ffc9 /drivers/block
parent24b20ac6e1c80082889b3d6ae08aadda777519e5 (diff)
[PATCH] deadline: clean up question mark operator
That ?: trick gives us the creeps. 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')
-rw-r--r--drivers/block/deadline-iosched.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index 24594c57c32..52a3ae5289a 100644
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -512,7 +512,10 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
/*
* batches are currently reads XOR writes
*/
- drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
+ if (dd->next_drq[WRITE])
+ drq = dd->next_drq[WRITE];
+ else
+ drq = dd->next_drq[READ];
if (drq) {
/* we have a "next request" */