Skip to content

Commit

Permalink
block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu()
Browse files Browse the repository at this point in the history
The rcu callback disk_free_ptbl_rcu_cb() just calls a kfree(),
so we use kfree_rcu() instead of the call_rcu(disk_free_ptbl_rcu_cb).

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
  • Loading branch information
Lai Jiangshan authored and Paul E. McKenney committed Jul 20, 2011
1 parent 8497a24 commit 57bdfbf
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions block/genhd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
}
}

Expand Down

0 comments on commit 57bdfbf

Please sign in to comment.