diff --git a/[refs] b/[refs] index d2aecedbdbe4..d8554019ea46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f6f38dbb0fc8518b19542b0ad0739a8a95f05a1 +refs/heads/master: 75274551c81796b636c5acb0c2597dec7ec2e6c4 diff --git a/trunk/block/deadline-iosched.c b/trunk/block/deadline-iosched.c index 599b12e5380f..90037b5eb17f 100644 --- a/trunk/block/deadline-iosched.c +++ b/trunk/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;