tree f4248260b6eb657f42050396070fdf799af7ffc9
parent 24b20ac6e1c80082889b3d6ae08aadda777519e5
author Andrew Morton <[EMAIL PROTECTED]> Sat, 10 Sep 2005 03:02:12 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sat, 10 Sep 2005 03:57:33 -0700

[PATCH] deadline: clean up question mark operator

That ?: trick gives us the creeps.

Cc: Jens Axboe <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 drivers/block/deadline-iosched.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -512,7 +512,10 @@ static int deadline_dispatch_requests(st
        /*
         * 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" */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to