block: remove alloc_part_info and free_part_info (f17c21c1) · Commits · 戴 / test

block/partition-generic.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -249,7 +249,9 @@ struct hd_struct add_partition(struct gendisk disk, int partno,
		p->policy = get_disk_ro(disk);

		if (info) {
		struct partition_meta_info *pinfo = alloc_part_info(disk);
		struct partition_meta_info *pinfo;

		pinfo = kzalloc_node(sizeof(*pinfo), GFP_KERNEL, disk->node_id);
		if (!pinfo) {
		err = -ENOMEM;
		goto out_free_stats;
		@@ -308,7 +310,7 @@ struct hd_struct add_partition(struct gendisk disk, int partno,
		return p;

		out_free_info:
		free_part_info(p);
		kfree(p->info);
		out_free_stats:
		free_part_stats(p);
		out_free:

+1 −14

Original line number	Diff line number	Diff line
		@@ -465,19 +465,6 @@ void part_dec_in_flight(struct request_queue q, struct hd_struct part,
		void part_inc_in_flight(struct request_queue q, struct hd_struct part,
		int rw);

		static inline struct partition_meta_info alloc_part_info(struct gendisk disk)
		{
		if (disk)
		return kzalloc_node(sizeof(struct partition_meta_info),
		GFP_KERNEL, disk->node_id);
		return kzalloc(sizeof(struct partition_meta_info), GFP_KERNEL);
		}

		static inline void free_part_info(struct hd_struct *part)
		{
		kfree(part->info);
		}

		void update_io_ticks(struct hd_struct *part, unsigned long now);

		/* block/genhd.c */
		@@ -755,7 +742,7 @@ static inline void hd_struct_kill(struct hd_struct *part)
		static inline void hd_free_part(struct hd_struct *part)
		{
		free_part_stats(part);
		free_part_info(part);
		kfree(part->info);
		percpu_ref_exit(&part->ref);
		}