From 0aaee370e6509d7fe3216f846439c0577210bad6 Mon Sep 17 00:00:00 2001 From: Hiroaki SHIMODA Date: Wed, 30 May 2012 12:25:37 +0000 Subject: [PATCH] --- yaml --- r: 310409 b: refs/heads/master c: 914bec1011a25f65cdc94988a6f974bfb9a3c10d h: refs/heads/master i: 310407: 6e05d53d96a9b69a5d89c29fb0e8dfad14015509 v: v3 --- [refs] | 2 +- trunk/lib/dynamic_queue_limits.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2efad0fb7f3a..e1d28ad5d245 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25426b794efdc70dde7fd3134dc56fac3e7d562d +refs/heads/master: 914bec1011a25f65cdc94988a6f974bfb9a3c10d diff --git a/trunk/lib/dynamic_queue_limits.c b/trunk/lib/dynamic_queue_limits.c index 0fafa77f4036..0777c5a45fa0 100644 --- a/trunk/lib/dynamic_queue_limits.c +++ b/trunk/lib/dynamic_queue_limits.c @@ -17,16 +17,18 @@ void dql_completed(struct dql *dql, unsigned int count) { unsigned int inprogress, prev_inprogress, limit; - unsigned int ovlimit, completed; + unsigned int ovlimit, completed, num_queued; bool all_prev_completed; + num_queued = ACCESS_ONCE(dql->num_queued); + /* Can't complete more than what's in queue */ - BUG_ON(count > dql->num_queued - dql->num_completed); + BUG_ON(count > num_queued - dql->num_completed); completed = dql->num_completed + count; limit = dql->limit; - ovlimit = POSDIFF(dql->num_queued - dql->num_completed, limit); - inprogress = dql->num_queued - completed; + ovlimit = POSDIFF(num_queued - dql->num_completed, limit); + inprogress = num_queued - completed; prev_inprogress = dql->prev_num_queued - dql->num_completed; all_prev_completed = AFTER_EQ(completed, dql->prev_num_queued); @@ -106,7 +108,7 @@ void dql_completed(struct dql *dql, unsigned int count) dql->prev_ovlimit = ovlimit; dql->prev_last_obj_cnt = dql->last_obj_cnt; dql->num_completed = completed; - dql->prev_num_queued = dql->num_queued; + dql->prev_num_queued = num_queued; } EXPORT_SYMBOL(dql_completed);