From 00eb0c8c3f46187fb8c536162132908fc7395bd1 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Fri, 18 Mar 2011 11:42:58 +0800
Subject: [PATCH] --- yaml --- r: 257003 b: refs/heads/master c:
 57bdfbf9ee2b0856d8b62180c3b3f8fa1533b8d1 h: refs/heads/master i:   257001:
 4a3c69243d05d2c89f0239cf4a4e6cbf35575186   256999:
 4c3e610170004a6900507aa2100eab69d19f2f98 v: v3

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

diff --git a/[refs] b/[refs]
index f828e196cccb..38f0fe95a240 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8497a24a43374f0142335b0ef0614ccc459e3d8d
+refs/heads/master: 57bdfbf9ee2b0856d8b62180c3b3f8fa1533b8d1
diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c
index 3608289c8ecd..6024b82e3209 100644
--- a/trunk/block/genhd.c
+++ b/trunk/block/genhd.c
@@ -1018,14 +1018,6 @@ static const struct attribute_group *disk_attr_groups[] = {
 	NULL
 };
 
-static void disk_free_ptbl_rcu_cb(struct rcu_head *head)
-{
-	struct disk_part_tbl *ptbl =
-		container_of(head, struct disk_part_tbl, rcu_head);
-
-	kfree(ptbl);
-}
-
 /**
  * disk_replace_part_tbl - replace disk->part_tbl in RCU-safe way
  * @disk: disk to replace part_tbl for
@@ -1046,7 +1038,7 @@ static void disk_replace_part_tbl(struct gendisk *disk,
 
 	if (old_ptbl) {
 		rcu_assign_pointer(old_ptbl->last_lookup, NULL);
-		call_rcu(&old_ptbl->rcu_head, disk_free_ptbl_rcu_cb);
+		kfree_rcu(old_ptbl, rcu_head);
 	}
 }