[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1348481238-6138-6-git-send-email-laijs@cn.fujitsu.com>
Date: Mon, 24 Sep 2012 18:07:07 +0800
From: Lai Jiangshan <laijs@...fujitsu.com>
To: Tejun Heo <tj@...nel.org>, linux-kernel@...r.kernel.org
Cc: Lai Jiangshan <laijs@...fujitsu.com>
Subject: [PATCH 05/10] workqueue: add wq_dec_flusher_ref()
it is a helper to relase reference.
This patch doesn't make any functional difference.
Signed-off-by: Lai Jiangshan <laijs@...fujitsu.com>
---
kernel/workqueue.c | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 861b4c7..e5ba08c 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -995,6 +995,16 @@ static void cwq_activate_first_delayed(struct cpu_workqueue_struct *cwq)
cwq_activate_delayed_work(work);
}
+static void wq_dec_flusher_ref(struct workqueue_struct *wq, int color)
+{
+ /*
+ * If this was the last reference, wake up the first flusher.
+ * It will handle the rest.
+ */
+ if (atomic_dec_and_test(&wq->nr_cwqs_to_flush[color]))
+ complete(&wq->first_flusher->done);
+}
+
/**
* cwq_dec_nr_in_flight - decrement cwq's nr_in_flight
* @cwq: cwq of interest
@@ -1032,12 +1042,7 @@ static void cwq_dec_nr_in_flight(struct cpu_workqueue_struct *cwq, int color)
/* this cwq is done, clear flush_color */
cwq->flush_color = -1;
- /*
- * If this was the last cwq, wake up the first flusher. It
- * will handle the rest.
- */
- if (atomic_dec_and_test(&cwq->wq->nr_cwqs_to_flush[color]))
- complete(&cwq->wq->first_flusher->done);
+ wq_dec_flusher_ref(cwq->wq, color);
}
/**
@@ -2594,9 +2599,8 @@ static bool flush_workqueue_prep_cwqs(struct workqueue_struct *wq,
spin_unlock_irq(&gcwq->lock);
}
- if (flush_color >= 0 &&
- atomic_dec_and_test(&wq->nr_cwqs_to_flush[flush_color]))
- complete(&wq->first_flusher->done);
+ if (flush_color >= 0)
+ wq_dec_flusher_ref(wq, flush_color);
return wait;
}
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists