Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1185462

[PATCH 1/4] block: partition: introduce hd_free_part()

Show all headers | View raw

So the helper can be used in both generic partition
case and part0 case.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
---
 block/genhd.c             | 3 +--
 block/partition-generic.c | 3 +--
 include/linux/genhd.h     | 6 ++++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/block/genhd.c b/block/genhd.c
index e552e1b..ed3f5b9 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1110,8 +1110,7 @@ static void disk_release(struct device *dev)
 	disk_release_events(disk);
 	kfree(disk->random);
 	disk_replace_part_tbl(disk, NULL);
-	free_part_stats(&disk->part0);
-	free_part_info(&disk->part0);
+	hd_free_part(&disk->part0);
 	if (disk->queue)
 		blk_put_queue(disk->queue);
 	kfree(disk);
diff --git a/block/partition-generic.c b/block/partition-generic.c
index 0d9e5f9..eca0d02 100644
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -212,8 +212,7 @@ static void part_release(struct device *dev)
 {
 	struct hd_struct *p = dev_to_part(dev);
 	blk_free_devt(dev->devt);
-	free_part_stats(p);
-	free_part_info(p);
+	hd_free_part(p);
 	kfree(p);
 }
 
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index ec274e0..a221220 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -663,6 +663,12 @@ static inline void hd_struct_put(struct hd_struct *part)
 		__delete_partition(part);
 }
 
+static inline void hd_free_part(struct hd_struct *part)
+{
+	free_part_stats(part);
+	free_part_info(part);
+}
+
 /*
  * Any access of part->nr_sects which is not protected by partition
  * bd_mutex or gendisk bdev bd_mutex, should be done using this
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] block: account io: kill atomic operations Ming Lei <tom.leiming@gmail.com> - 2015-07-16 05:20 +0200
  [PATCH 3/4] block: partition: introduce 'cpu' para to part_inc|dec_in_flight Ming Lei <tom.leiming@gmail.com> - 2015-07-16 05:30 +0200
  [PATCH 1/4] block: partition: introduce hd_free_part() Ming Lei <tom.leiming@gmail.com> - 2015-07-16 05:30 +0200
  [PATCH 2/4] block: partition: convert percpu ref Ming Lei <tom.leiming@gmail.com> - 2015-07-16 05:30 +0200
    Re: [PATCH 2/4] block: partition: convert percpu ref Tejun Heo <tj@kernel.org> - 2015-07-16 16:40 +0200
  [PATCH 4/4] block: account io: convert part->in_fligh[] into percpu variable Ming Lei <tom.leiming@gmail.com> - 2015-07-16 05:30 +0200
    Re: [PATCH 4/4] block: account io: convert part->in_fligh[] into  percpu variable Tejun Heo <tj@kernel.org> - 2015-07-16 16:50 +0200
  Re: [PATCH 0/4] block: account io: kill atomic operations Jens Axboe <axboe@kernel.dk> - 2015-07-16 16:50 +0200
    Re: [PATCH 0/4] block: account io: kill atomic operations Tejun Heo <tj@kernel.org> - 2015-07-16 17:00 +0200
      Re: [PATCH 0/4] block: account io: kill atomic operations Jens Axboe <axboe@kernel.dk> - 2015-07-16 17:10 +0200
    Re: [PATCH 0/4] block: account io: kill atomic operations Jens Axboe <axboe@kernel.dk> - 2015-07-16 17:10 +0200
    Re: [PATCH 0/4] block: account io: kill atomic operations Ming Lei <tom.leiming@gmail.com> - 2015-07-16 17:10 +0200

csiph-web