block: move the partition_meta_info to struct block_device (231926db) · Commits · 戴 / test

block/blk.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,6 @@ static inline void hd_struct_put(struct hd_struct *part)

		static inline void hd_free_part(struct hd_struct *part)
		{
		kfree(part->info);
		bdput(part->bdev);
		percpu_ref_exit(&part->ref);
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -1010,7 +1010,8 @@ void __init printk_all_partitions(void)
		bdevt_str(part_devt(part), devt_buf),
		bdev_nr_sectors(part->bdev) >> 1,
		disk_name(disk, part->partno, name_buf),
		part->info ? part->info->uuid : "");
		part->bdev->bd_meta_info ?
		part->bdev->bd_meta_info->uuid : "");
		if (is_part0) {
		if (dev->parent && dev->parent->driver)
		printk(" driver: %s\n",

+7 −11

Original line number	Diff line number	Diff line
		@@ -275,8 +275,9 @@ static int part_uevent(struct device dev, struct kobj_uevent_env env)
		struct hd_struct *part = dev_to_part(dev);

		add_uevent_var(env, "PARTN=%u", part->partno);
		if (part->info && part->info->volname[0])
		add_uevent_var(env, "PARTNAME=%s", part->info->volname);
		if (part->bdev->bd_meta_info && part->bdev->bd_meta_info->volname[0])
		add_uevent_var(env, "PARTNAME=%s",
		part->bdev->bd_meta_info->volname);
		return 0;
		}

		@@ -422,13 +423,10 @@ static struct hd_struct add_partition(struct gendisk disk, int partno,
		p->policy = get_disk_ro(disk);

		if (info) {
		struct partition_meta_info *pinfo;

		pinfo = kzalloc_node(sizeof(*pinfo), GFP_KERNEL, disk->node_id);
		if (!pinfo)
		err = -ENOMEM;
		bdev->bd_meta_info = kmemdup(info, sizeof(*info), GFP_KERNEL);
		if (!bdev->bd_meta_info)
		goto out_bdput;
		memcpy(pinfo, info, sizeof(*info));
		p->info = pinfo;
		}

		dname = dev_name(ddev);
		@@ -444,7 +442,7 @@ static struct hd_struct add_partition(struct gendisk disk, int partno,

		err = blk_alloc_devt(p, &devt);
		if (err)
		goto out_free_info;
		goto out_bdput;
		pdev->devt = devt;

		/* delay uevent until 'holders' subdir is created */
		@@ -481,8 +479,6 @@ static struct hd_struct add_partition(struct gendisk disk, int partno,
		kobject_uevent(&pdev->kobj, KOBJ_ADD);
		return p;

		out_free_info:
		kfree(p->info);
		out_bdput:
		bdput(bdev);
		out_free:

+1 −0

Original line number	Diff line number	Diff line
		@@ -785,6 +785,7 @@ static void bdev_free_inode(struct inode *inode)
		struct block_device *bdev = I_BDEV(inode);

		free_percpu(bdev->bd_stats);
		kfree(bdev->bd_meta_info);

		kmem_cache_free(bdev_cachep, BDEV_I(inode));
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ struct block_device {
		/* Mutex for freeze */
		struct mutex bd_fsfreeze_mutex;
		struct super_block *bd_fsfreeze_sb;

		struct partition_meta_info *bd_meta_info;
		} __randomize_layout;

		#define bdev_whole(_bdev) \