Merge tag 'for-3.8-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[deliverable/linux.git] / block / deadline-iosched.c

diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index 599b12e5380f50aa32e35ec3096b035437842805..90037b5eb17fca86bc2212241a6d1916cf83960c 100644 (file)
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -230,7 +230,7 @@ static inline int deadline_check_fifo(struct deadline_data *dd, int ddir)
        /*
         * rq is expired!
         */
-       if (time_after(jiffies, rq_fifo_time(rq)))
+       if (time_after_eq(jiffies, rq_fifo_time(rq)))
                return 1;
 
        return 0;