From 90aebccc265d339c2793adbc474656acf7617a56 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 9 Jan 2013 08:05:13 -0800
Subject: [PATCH] --- yaml --- r: 359511 b: refs/heads/master c:
 689665af4489f779bc82e7869509c9ac11b5a903 h: refs/heads/master i:   359509:
 066c399b3123de8737e121b31dde606120469993   359507:
 242ac2983d26bd22afef382dc8a31b90ec86dda8   359503:
 a52298c7a09c9d26e8ffbcc700d80793a5020487 v: v3

---
 [refs]                    |  2 +-
 trunk/block/cfq-iosched.c | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3b19f04535af..0ae5eab89d0c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 810ecfa765f8be20c8d9c468885b3403a2232d2f
+refs/heads/master: 689665af4489f779bc82e7869509c9ac11b5a903
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index d43145cc0088..f8b34bbbd372 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -688,11 +688,9 @@ static inline void cfqg_stats_update_completion(struct cfq_group *cfqg,
 				io_start_time - start_time);
 }
 
-static void cfq_pd_reset_stats(struct blkcg_gq *blkg)
+/* @stats = 0 */
+static void cfqg_stats_reset(struct cfqg_stats *stats)
 {
-	struct cfq_group *cfqg = blkg_to_cfqg(blkg);
-	struct cfqg_stats *stats = &cfqg->stats;
-
 	/* queued stats shouldn't be cleared */
 	blkg_rwstat_reset(&stats->service_bytes);
 	blkg_rwstat_reset(&stats->serviced);
@@ -1477,6 +1475,13 @@ static void cfq_pd_init(struct blkcg_gq *blkg)
 	cfqg->leaf_weight = blkg->blkcg->cfq_leaf_weight;
 }
 
+static void cfq_pd_reset_stats(struct blkcg_gq *blkg)
+{
+	struct cfq_group *cfqg = blkg_to_cfqg(blkg);
+
+	cfqg_stats_reset(&cfqg->stats);
+}
+
 /*
  * Search for the cfq group current task belongs to. request_queue lock must
  * be held.