[PATCH] deadline: clean up question mark operator
authorAndrew Morton <akpm@osdl.org>
Fri, 9 Sep 2005 20:02:12 +0000 (13:02 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 20:57:33 +0000 (13:57 -0700)
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>
drivers/block/deadline-iosched.c

index 24594c5..52a3ae5 100644 (file)
@@ -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" */