From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Tejun Heo <tj@kernel.org>,
Josef Bacik <josef@toxicpanda.com>, Coly Li <colyli@suse.de>,
Mike Snitzer <snitzer@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jan Kara <jack@suse.cz>,
Johannes Thumshirn <johannes.thumshirn@wdc.com>,
dm-devel@redhat.com, Jan Kara <jack@suse.com>,
linux-block@vger.kernel.org, linux-bcache@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org,
linux-mm@kvack.org
Subject: Re: [PATCH 32/44] block: move the partition_meta_info to struct block_device
Date: Thu, 26 Nov 2020 17:58:49 +0100 [thread overview]
Message-ID: <20201126165849.GR422@quack2.suse.cz> (raw)
In-Reply-To: <20201126130422.92945-33-hch@lst.de>
On Thu 26-11-20 14:04:10, Christoph Hellwig wrote:
> Move the partition_meta_info to struct block_device in preparation for
> killing struct hd_struct.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Looks good to me. You can add:
Reviewed-by: Jan Kara <jack@suse.cz>
Honza
> ---
> block/blk.h | 1 -
> block/genhd.c | 3 ++-
> block/partitions/core.c | 18 +++++++-----------
> fs/block_dev.c | 1 +
> include/linux/blk_types.h | 2 ++
> include/linux/genhd.h | 1 -
> init/do_mounts.c | 7 ++++---
> 7 files changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/block/blk.h b/block/blk.h
> index 3f801f6e86f8a1..0bd4b58bcbaf77 100644
> --- a/block/blk.h
> +++ b/block/blk.h
> @@ -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);
> }
> diff --git a/block/genhd.c b/block/genhd.c
> index 7bb45382658385..fe202a12eec096 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -1002,7 +1002,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",
> diff --git a/block/partitions/core.c b/block/partitions/core.c
> index 485777cea26bfa..224a22d82fb86f 100644
> --- a/block/partitions/core.c
> +++ b/block/partitions/core.c
> @@ -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:
> diff --git a/fs/block_dev.c b/fs/block_dev.c
> index 11e6a9a255845d..62fae6a0e8aa56 100644
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@ -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));
> }
> diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
> index a690008f60cd92..2f8ede04e5a94c 100644
> --- a/include/linux/blk_types.h
> +++ b/include/linux/blk_types.h
> @@ -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) \
> diff --git a/include/linux/genhd.h b/include/linux/genhd.h
> index 50d27f5d38e2af..30d7076155b4d2 100644
> --- a/include/linux/genhd.h
> +++ b/include/linux/genhd.h
> @@ -57,7 +57,6 @@ struct hd_struct {
> struct device __dev;
> struct kobject *holder_dir;
> int policy, partno;
> - struct partition_meta_info *info;
> #ifdef CONFIG_FAIL_MAKE_REQUEST
> int make_it_fail;
> #endif
> diff --git a/init/do_mounts.c b/init/do_mounts.c
> index 5879edf083b318..368ccb71850126 100644
> --- a/init/do_mounts.c
> +++ b/init/do_mounts.c
> @@ -79,8 +79,8 @@ static int match_dev_by_uuid(struct device *dev, const void *data)
> const struct uuidcmp *cmp = data;
> struct hd_struct *part = dev_to_part(dev);
>
> - if (!part->info ||
> - strncasecmp(cmp->uuid, part->info->uuid, cmp->len))
> + if (!part->bdev->bd_meta_info ||
> + strncasecmp(cmp->uuid, part->bdev->bd_meta_info->uuid, cmp->len))
> return 0;
> return 1;
> }
> @@ -169,7 +169,8 @@ static int match_dev_by_label(struct device *dev, const void *data)
> const char *label = data;
> struct hd_struct *part = dev_to_part(dev);
>
> - if (!part->info || strcmp(label, part->info->volname))
> + if (!part->bdev->bd_meta_info ||
> + strcmp(label, part->bdev->bd_meta_info->volname))
> return 0;
> return 1;
> }
> --
> 2.29.2
>
--
Jan Kara <jack@suse.com>
SUSE Labs, CR
next prev parent reply other threads:[~2020-11-26 16:58 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-26 13:03 merge struct block_device and struct hd_struct v3 Christoph Hellwig
2020-11-26 13:03 ` [PATCH 01/44] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-26 13:03 ` [PATCH 02/44] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-26 13:03 ` [PATCH 03/44] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-26 13:03 ` [PATCH 04/44] fs: simplify freeze_bdev/thaw_bdev Christoph Hellwig
2020-11-26 14:13 ` Jan Kara
2020-11-26 13:03 ` [PATCH 05/44] mtip32xx: remove the call to fsync_bdev on removal Christoph Hellwig
2020-11-26 13:03 ` [PATCH 06/44] zram: do not call set_blocksize Christoph Hellwig
2020-11-26 13:03 ` [PATCH 07/44] loop: " Christoph Hellwig
2020-11-26 13:03 ` [PATCH 08/44] dm: simplify flush_bio initialization in __send_empty_flush Christoph Hellwig
2020-11-26 13:03 ` [PATCH 09/44] dm: remove the block_device reference in struct mapped_device Christoph Hellwig
2020-11-27 10:36 ` Hannes Reinecke
2020-11-26 13:03 ` [PATCH 10/44] block: remove a duplicate __disk_get_part prototype Christoph Hellwig
2020-11-27 10:36 ` Hannes Reinecke
2020-11-26 13:03 ` [PATCH 11/44] block: remove a superflous check in blkpg_do_ioctl Christoph Hellwig
2020-11-27 10:37 ` Hannes Reinecke
2020-11-26 13:03 ` [PATCH 12/44] block: add a bdev_kobj helper Christoph Hellwig
2020-11-26 14:47 ` David Sterba
2020-11-27 12:03 ` Hannes Reinecke
2020-11-26 13:03 ` [PATCH 13/44] block: use disk_part_iter_exit in disk_part_iter_next Christoph Hellwig
2020-11-27 12:04 ` Hannes Reinecke
2020-11-26 13:03 ` [PATCH 14/44] block: use put_device in put_disk Christoph Hellwig
2020-11-26 13:03 ` [PATCH 15/44] block: change the hash used for looking up block devices Christoph Hellwig
2020-11-26 13:03 ` [PATCH 16/44] init: refactor name_to_dev_t Christoph Hellwig
2020-11-26 13:03 ` [PATCH 17/44] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-26 13:03 ` [PATCH 18/44] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-26 13:03 ` [PATCH 19/44] block: refactor __blkdev_put Christoph Hellwig
2020-11-26 13:03 ` [PATCH 20/44] block: refactor blkdev_get Christoph Hellwig
2020-11-26 14:55 ` Jan Kara
2020-11-26 13:03 ` [PATCH 21/44] block: move bdput() to the callers of __blkdev_get Christoph Hellwig
2020-11-26 15:05 ` Jan Kara
2020-11-26 13:04 ` [PATCH 22/44] block: opencode devcgroup_inode_permission Christoph Hellwig
2020-11-26 15:07 ` Jan Kara
2020-11-26 13:04 ` [PATCH 23/44] block: remove i_bdev Christoph Hellwig
2020-11-26 15:45 ` Jan Kara
2020-11-26 13:04 ` [PATCH 24/44] block: simplify bdev/disk lookup in blkdev_get Christoph Hellwig
2020-11-26 16:33 ` Jan Kara
2020-11-26 17:42 ` Christoph Hellwig
2020-11-26 13:04 ` [PATCH 25/44] block: remove ->bd_contains Christoph Hellwig
2020-11-26 13:04 ` [PATCH 26/44] block: simplify the block device claiming interface Christoph Hellwig
2020-11-26 13:04 ` [PATCH 27/44] block: simplify part_to_disk Christoph Hellwig
2020-11-26 16:36 ` Jan Kara
2020-11-26 13:04 ` [PATCH 28/44] block: initialize struct block_device in bdev_alloc Christoph Hellwig
2020-11-26 16:37 ` Jan Kara
2020-11-26 13:04 ` [PATCH 29/44] block: remove the nr_sects field in struct hd_struct Christoph Hellwig
2020-11-26 16:50 ` Jan Kara
2020-11-26 17:52 ` Christoph Hellwig
2020-11-26 18:04 ` Jan Kara
2020-11-27 9:41 ` Christoph Hellwig
2020-11-26 13:04 ` [PATCH 30/44] block: move disk stat accounting to struct block_device Christoph Hellwig
2020-11-26 16:53 ` Jan Kara
2020-11-26 13:04 ` [PATCH 31/44] block: move the start_sect field " Christoph Hellwig
2020-11-26 16:56 ` Jan Kara
2020-11-26 18:02 ` Christoph Hellwig
2020-11-26 13:04 ` [PATCH 32/44] block: move the partition_meta_info " Christoph Hellwig
2020-11-26 16:58 ` Jan Kara [this message]
2020-11-26 13:04 ` [PATCH 33/44] block: move holder_dir " Christoph Hellwig
2020-11-26 17:00 ` Jan Kara
2020-11-26 13:04 ` [PATCH 34/44] block: move make_it_fail " Christoph Hellwig
2020-11-26 17:01 ` Jan Kara
2020-11-26 13:04 ` [PATCH 35/44] block: move the policy field " Christoph Hellwig
2020-11-26 17:03 ` Jan Kara
2020-11-26 13:04 ` [PATCH 36/44] block: allocate struct hd_struct as part of struct bdev_inode Christoph Hellwig
2020-11-26 17:35 ` Jan Kara
2020-11-26 18:00 ` Jan Kara
2020-11-26 18:02 ` Christoph Hellwig
2020-11-26 13:04 ` [PATCH 37/44] block: switch partition lookup to use struct block_device Christoph Hellwig
2020-11-26 17:45 ` Jan Kara
2020-11-26 18:22 ` Jan Kara
2020-11-27 9:48 ` Christoph Hellwig
2020-11-27 12:45 ` Jan Kara
2020-11-27 15:36 ` Christoph Hellwig
2020-11-27 17:26 ` Jan Kara
2020-11-26 13:04 ` [PATCH 38/44] block: remove the partno field from struct hd_struct Christoph Hellwig
2020-11-26 17:46 ` Jan Kara
2020-11-26 13:04 ` [PATCH 39/44] block: pass a block_device to blk_alloc_devt Christoph Hellwig
2020-11-26 17:47 ` Jan Kara
2020-11-26 13:04 ` [PATCH 40/44] block: pass a block_device to invalidate_partition Christoph Hellwig
2020-11-26 17:49 ` Jan Kara
2020-11-26 13:04 ` [PATCH 41/44] block: switch disk_part_iter_* to use a struct block_device Christoph Hellwig
2020-11-27 12:53 ` Jan Kara
2020-11-27 15:24 ` Christoph Hellwig
2020-11-27 17:30 ` Jan Kara
2020-11-26 13:04 ` [PATCH 42/44] f2fs: remove a few bd_part checks Christoph Hellwig
2020-11-26 13:04 ` [PATCH 43/44] block: merge struct block_device and struct hd_struct Christoph Hellwig
2020-11-27 13:19 ` Jan Kara
2020-11-27 15:47 ` Christoph Hellwig
2020-11-26 13:04 ` [PATCH 44/44] block: stop using bdget_disk for partition 0 Christoph Hellwig
2020-11-27 13:22 ` Jan Kara
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201126165849.GR422@quack2.suse.cz \
--to=jack@suse.cz \
--cc=axboe@kernel.dk \
--cc=colyli@suse.de \
--cc=dm-devel@redhat.com \
--cc=gregkh@linuxfoundation.org \
--cc=hch@lst.de \
--cc=jack@suse.com \
--cc=johannes.thumshirn@wdc.com \
--cc=josef@toxicpanda.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-mtd@lists.infradead.org \
--cc=snitzer@redhat.com \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).