---

yaml --- r: 257003 b: refs/heads/master c: 57bdfbf h: refs/heads/master i: 257001: 4a3c692 256999: 4c3e610 v: v3
git-mirror · Jul 20, 2011 · 00eb0c8 · 00eb0c8
1 parent 62399af
commit 00eb0c8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git 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
@@ -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);
 	}
 }