Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57bdfbf9 authored by Lai Jiangshan's avatar Lai Jiangshan Committed by Paul E. McKenney
Browse files

block,rcu: Convert call_rcu(disk_free_ptbl_rcu_cb) to kfree_rcu() 



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: default avatarLai Jiangshan <laijs@cn.fujitsu.com>
Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
parent 8497a24a

block/genhd.c

+1 −9
Original line number Original line Diff line number Diff line
@@ -1018,14 +1018,6 @@ static const struct attribute_group *disk_attr_groups[] = { 
	NULL

	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_replace_part_tbl - replace disk->part_tbl in RCU-safe way

 * @disk: disk to replace part_tbl for

 * @disk: disk to replace part_tbl for
@@ -1046,7 +1038,7 @@ static void disk_replace_part_tbl(struct gendisk *disk, 




	if (old_ptbl) {

	if (old_ptbl) {

		rcu_assign_pointer(old_ptbl->last_lookup, NULL);

		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);

	}

	}

}

}