Commit 8da2892e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: cleanup hd_struct freeing

Move hd_ref_init out of line as there it isn't anywhere near a fast path,
and rename the rcu ref freeing callbacks to be more descriptive.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent cddae808
...@@ -389,7 +389,6 @@ char *disk_name(struct gendisk *hd, int partno, char *buf); ...@@ -389,7 +389,6 @@ char *disk_name(struct gendisk *hd, int partno, char *buf);
#define ADDPART_FLAG_NONE 0 #define ADDPART_FLAG_NONE 0
#define ADDPART_FLAG_RAID 1 #define ADDPART_FLAG_RAID 1
#define ADDPART_FLAG_WHOLEDISK 2 #define ADDPART_FLAG_WHOLEDISK 2
void __delete_partition(struct percpu_ref *ref);
void delete_partition(struct gendisk *disk, struct hd_struct *part); void delete_partition(struct gendisk *disk, struct hd_struct *part);
int bdev_add_partition(struct block_device *bdev, int partno, int bdev_add_partition(struct block_device *bdev, int partno,
sector_t start, sector_t length); sector_t start, sector_t length);
...@@ -397,14 +396,7 @@ int bdev_del_partition(struct block_device *bdev, int partno); ...@@ -397,14 +396,7 @@ int bdev_del_partition(struct block_device *bdev, int partno);
int bdev_resize_partition(struct block_device *bdev, int partno, int bdev_resize_partition(struct block_device *bdev, int partno,
sector_t start, sector_t length); sector_t start, sector_t length);
int disk_expand_part_tbl(struct gendisk *disk, int target); int disk_expand_part_tbl(struct gendisk *disk, int target);
int hd_ref_init(struct hd_struct *part);
static inline int hd_ref_init(struct hd_struct *part)
{
if (percpu_ref_init(&part->ref, __delete_partition, 0,
GFP_KERNEL))
return -ENOMEM;
return 0;
}
static inline void hd_struct_get(struct hd_struct *part) static inline void hd_struct_get(struct hd_struct *part)
{ {
......
...@@ -274,10 +274,10 @@ struct device_type part_type = { ...@@ -274,10 +274,10 @@ struct device_type part_type = {
.uevent = part_uevent, .uevent = part_uevent,
}; };
static void delete_partition_work_fn(struct work_struct *work) static void hd_struct_free_work(struct work_struct *work)
{ {
struct hd_struct *part = container_of(to_rcu_work(work), struct hd_struct, struct hd_struct *part =
rcu_work); container_of(to_rcu_work(work), struct hd_struct, rcu_work);
part->start_sect = 0; part->start_sect = 0;
part->nr_sects = 0; part->nr_sects = 0;
...@@ -285,13 +285,21 @@ static void delete_partition_work_fn(struct work_struct *work) ...@@ -285,13 +285,21 @@ static void delete_partition_work_fn(struct work_struct *work)
put_device(part_to_dev(part)); put_device(part_to_dev(part));
} }
void __delete_partition(struct percpu_ref *ref) static void hd_struct_free(struct percpu_ref *ref)
{ {
struct hd_struct *part = container_of(ref, struct hd_struct, ref); struct hd_struct *part = container_of(ref, struct hd_struct, ref);
INIT_RCU_WORK(&part->rcu_work, delete_partition_work_fn);
INIT_RCU_WORK(&part->rcu_work, hd_struct_free_work);
queue_rcu_work(system_wq, &part->rcu_work); queue_rcu_work(system_wq, &part->rcu_work);
} }
int hd_ref_init(struct hd_struct *part)
{
if (percpu_ref_init(&part->ref, hd_struct_free, 0, GFP_KERNEL))
return -ENOMEM;
return 0;
}
/* /*
* Must be called either with bd_mutex held, before a disk can be opened or * Must be called either with bd_mutex held, before a disk can be opened or
* after all disk users are gone. * after all disk users are gone.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment