diff options
| author | Andrew Morton | 2005-09-09 22:02:12 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-09-09 22:57:33 +0200 |
| commit | 9d5c1e1bf2b906966609f8cf4a844e61adb86bcd (patch) | |
| tree | f4248260b6eb657f42050396070fdf799af7ffc9 /drivers/block/deadline-iosched.c | |
| parent | [PATCH] remove unnecessary handle_IRQ_event() prototypes (diff) | |
| download | kernel-qcow2-linux-9d5c1e1bf2b906966609f8cf4a844e61adb86bcd.tar.gz kernel-qcow2-linux-9d5c1e1bf2b906966609f8cf4a844e61adb86bcd.tar.xz kernel-qcow2-linux-9d5c1e1bf2b906966609f8cf4a844e61adb86bcd.zip | |
[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/deadline-iosched.c')
| -rw-r--r-- | drivers/block/deadline-iosched.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c index 24594c57c323..52a3ae5289a0 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" */ |