From 7c83ec4dd114b0f3a6d2065d43f1a6fd85a39323 Mon Sep 17 00:00:00 2001
From: Divyesh Shah <dpshah@google.com>
Date: Fri, 16 Apr 2010 08:10:51 +0200
Subject: [PATCH] --- yaml --- r: 196814 b: refs/heads/master c:
 8d2a91f8960b230b8bbcc4d97ed2015f5271c87d h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/block/blk-cgroup.c  | 7 +------
 trunk/block/blk-cgroup.h  | 2 --
 trunk/block/cfq-iosched.c | 1 -
 4 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8daf0f3b1eed..b02ff535ce90 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b6ac23af2c66e114d3a87ef28d56f1ceec283007
+refs/heads/master: 8d2a91f8960b230b8bbcc4d97ed2015f5271c87d
diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c
index 80c1261a7d38..83930f65016a 100644
--- a/trunk/block/blk-cgroup.c
+++ b/trunk/block/blk-cgroup.c
@@ -86,12 +86,6 @@ struct blkio_cgroup *cgroup_to_blkio_cgroup(struct cgroup *cgroup)
 }
 EXPORT_SYMBOL_GPL(cgroup_to_blkio_cgroup);
 
-void blkio_group_init(struct blkio_group *blkg)
-{
-	spin_lock_init(&blkg->stats_lock);
-}
-EXPORT_SYMBOL_GPL(blkio_group_init);
-
 /*
  * Add to the appropriate stat variable depending on the request type.
  * This should be called with the blkg->stats_lock held.
@@ -349,6 +343,7 @@ void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg,
 	unsigned long flags;
 
 	spin_lock_irqsave(&blkcg->lock, flags);
+	spin_lock_init(&blkg->stats_lock);
 	rcu_assign_pointer(blkg->key, key);
 	blkg->blkcg_id = css_id(&blkcg->css);
 	hlist_add_head_rcu(&blkg->blkcg_node, &blkcg->blkg_list);
diff --git a/trunk/block/blk-cgroup.h b/trunk/block/blk-cgroup.h
index 1d409ad9c6e8..2c956a06339a 100644
--- a/trunk/block/blk-cgroup.h
+++ b/trunk/block/blk-cgroup.h
@@ -217,7 +217,6 @@ extern void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg,
 extern int blkiocg_del_blkio_group(struct blkio_group *blkg);
 extern struct blkio_group *blkiocg_lookup_group(struct blkio_cgroup *blkcg,
 						void *key);
-void blkio_group_init(struct blkio_group *blkg);
 void blkiocg_update_timeslice_used(struct blkio_group *blkg,
 					unsigned long time);
 void blkiocg_update_dispatch_stats(struct blkio_group *blkg, uint64_t bytes,
@@ -235,7 +234,6 @@ struct cgroup;
 static inline struct blkio_cgroup *
 cgroup_to_blkio_cgroup(struct cgroup *cgroup) { return NULL; }
 
-static inline void blkio_group_init(struct blkio_group *blkg) {}
 static inline void blkiocg_add_blkio_group(struct blkio_cgroup *blkcg,
 			struct blkio_group *blkg, void *key, dev_t dev) {}
 
diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c
index 01771098355d..62defd05518f 100644
--- a/trunk/block/cfq-iosched.c
+++ b/trunk/block/cfq-iosched.c
@@ -961,7 +961,6 @@ cfq_find_alloc_cfqg(struct cfq_data *cfqd, struct cgroup *cgroup, int create)
 	for_each_cfqg_st(cfqg, i, j, st)
 		*st = CFQ_RB_ROOT;
 	RB_CLEAR_NODE(&cfqg->rb_node);
-	blkio_group_init(&cfqg->blkg);
 
 	/*
 	 * Take the initial reference that will be released on destroy