From d7e7d7d39f747d545be8bc546ff32e3bbd4a8376 Mon Sep 17 00:00:00 2001 From: Hiroaki SHIMODA Date: Wed, 30 May 2012 12:25:19 +0000 Subject: [PATCH] --- yaml --- r: 310408 b: refs/heads/master c: 25426b794efdc70dde7fd3134dc56fac3e7d562d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/dynamic_queue_limits.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 643849aee57b..2efad0fb7f3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cfd32b736ae0c36b42697584811042726c07cba +refs/heads/master: 25426b794efdc70dde7fd3134dc56fac3e7d562d diff --git a/trunk/lib/dynamic_queue_limits.c b/trunk/lib/dynamic_queue_limits.c index c87eb76f2fd4..0fafa77f4036 100644 --- a/trunk/lib/dynamic_queue_limits.c +++ b/trunk/lib/dynamic_queue_limits.c @@ -11,12 +11,14 @@ #include #define POSDIFF(A, B) ((int)((A) - (B)) > 0 ? (A) - (B) : 0) +#define AFTER_EQ(A, B) ((int)((A) - (B)) >= 0) /* Records completed count and recalculates the queue limit */ void dql_completed(struct dql *dql, unsigned int count) { unsigned int inprogress, prev_inprogress, limit; - unsigned int ovlimit, all_prev_completed, completed; + unsigned int ovlimit, completed; + bool all_prev_completed; /* Can't complete more than what's in queue */ BUG_ON(count > dql->num_queued - dql->num_completed); @@ -26,7 +28,7 @@ void dql_completed(struct dql *dql, unsigned int count) ovlimit = POSDIFF(dql->num_queued - dql->num_completed, limit); inprogress = dql->num_queued - completed; prev_inprogress = dql->prev_num_queued - dql->num_completed; - all_prev_completed = POSDIFF(completed, dql->prev_num_queued); + all_prev_completed = AFTER_EQ(completed, dql->prev_num_queued); if ((ovlimit && !inprogress) || (dql->prev_ovlimit && all_prev_completed)) {