DM-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Jan Kara <jack@suse.cz>
To: Christoph Hellwig <hch@lst.de>
Cc: Jens Axboe <axboe@kernel.dk>, Jan Kara <jack@suse.cz>,
	Mike Snitzer <snitzer@redhat.com>,
	linux-mm@kvack.org,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Jan Kara <jack@suse.com>, Josef Bacik <josef@toxicpanda.com>,
	Coly Li <colyli@suse.de>,
	linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	dm-devel@redhat.com, linux-mtd@lists.infradead.org,
	Johannes Thumshirn <johannes.thumshirn@wdc.com>,
	Tejun Heo <tj@kernel.org>,
	linux-bcache@vger.kernel.org
Subject: Re: [dm-devel] [PATCH 33/44] block: move holder_dir to struct block_device
Date: Thu, 26 Nov 2020 18:00:42 +0100
Message-ID: <20201126170042.GS422@quack2.suse.cz> (raw)
In-Reply-To: <20201126130422.92945-34-hch@lst.de>

On Thu 26-11-20 14:04:11, Christoph Hellwig wrote:
> Move the holder_dir field to struct block_device in preparation for
> kill struct hd_struct.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>

Looks good. You can add:

Reviewed-by: Jan Kara <jack@suse.cz>

								Honza

> ---
>  block/genhd.c             |  5 +++--
>  block/partitions/core.c   |  8 ++++----
>  fs/block_dev.c            | 11 +++++------
>  include/linux/blk_types.h |  1 +
>  include/linux/genhd.h     |  1 -
>  5 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/block/genhd.c b/block/genhd.c
> index fe202a12eec096..a964e7532fedd5 100644
> --- a/block/genhd.c
> +++ b/block/genhd.c
> @@ -673,7 +673,8 @@ static void register_disk(struct device *parent, struct gendisk *disk,
>  	 */
>  	pm_runtime_set_memalloc_noio(ddev, true);
>  
> -	disk->part0.holder_dir = kobject_create_and_add("holders", &ddev->kobj);
> +	disk->part0.bdev->bd_holder_dir =
> +			kobject_create_and_add("holders", &ddev->kobj);
>  	disk->slave_dir = kobject_create_and_add("slaves", &ddev->kobj);
>  
>  	if (disk->flags & GENHD_FL_HIDDEN) {
> @@ -879,7 +880,7 @@ void del_gendisk(struct gendisk *disk)
>  
>  	blk_unregister_queue(disk);
>  
> -	kobject_put(disk->part0.holder_dir);
> +	kobject_put(disk->part0.bdev->bd_holder_dir);
>  	kobject_put(disk->slave_dir);
>  
>  	part_stat_set_all(&disk->part0, 0);
> diff --git a/block/partitions/core.c b/block/partitions/core.c
> index 224a22d82fb86f..d1093adf2570e2 100644
> --- a/block/partitions/core.c
> +++ b/block/partitions/core.c
> @@ -344,7 +344,7 @@ void delete_partition(struct hd_struct *part)
>  	 */
>  	get_device(disk_to_dev(disk));
>  	rcu_assign_pointer(ptbl->part[part->partno], NULL);
> -	kobject_put(part->holder_dir);
> +	kobject_put(part->bdev->bd_holder_dir);
>  	device_del(part_to_dev(part));
>  
>  	/*
> @@ -452,8 +452,8 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno,
>  		goto out_put;
>  
>  	err = -ENOMEM;
> -	p->holder_dir = kobject_create_and_add("holders", &pdev->kobj);
> -	if (!p->holder_dir)
> +	bdev->bd_holder_dir = kobject_create_and_add("holders", &pdev->kobj);
> +	if (!bdev->bd_holder_dir)
>  		goto out_del;
>  
>  	dev_set_uevent_suppress(pdev, 0);
> @@ -487,7 +487,7 @@ static struct hd_struct *add_partition(struct gendisk *disk, int partno,
>  out_remove_file:
>  	device_remove_file(pdev, &dev_attr_whole_disk);
>  out_del:
> -	kobject_put(p->holder_dir);
> +	kobject_put(bdev->bd_holder_dir);
>  	device_del(pdev);
>  out_put:
>  	put_device(pdev);
> diff --git a/fs/block_dev.c b/fs/block_dev.c
> index 62fae6a0e8aa56..2c91c35149787a 100644
> --- a/fs/block_dev.c
> +++ b/fs/block_dev.c
> @@ -1138,7 +1138,7 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk)
>  	WARN_ON_ONCE(!bdev->bd_holder);
>  
>  	/* FIXME: remove the following once add_disk() handles errors */
> -	if (WARN_ON(!disk->slave_dir || !bdev->bd_part->holder_dir))
> +	if (WARN_ON(!disk->slave_dir || !bdev->bd_holder_dir))
>  		goto out_unlock;
>  
>  	holder = bd_find_holder_disk(bdev, disk);
> @@ -1161,14 +1161,14 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk)
>  	if (ret)
>  		goto out_free;
>  
> -	ret = add_symlink(bdev->bd_part->holder_dir, &disk_to_dev(disk)->kobj);
> +	ret = add_symlink(bdev->bd_holder_dir, &disk_to_dev(disk)->kobj);
>  	if (ret)
>  		goto out_del;
>  	/*
>  	 * bdev could be deleted beneath us which would implicitly destroy
>  	 * the holder directory.  Hold on to it.
>  	 */
> -	kobject_get(bdev->bd_part->holder_dir);
> +	kobject_get(bdev->bd_holder_dir);
>  
>  	list_add(&holder->list, &bdev->bd_holder_disks);
>  	goto out_unlock;
> @@ -1203,9 +1203,8 @@ void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk)
>  
>  	if (!WARN_ON_ONCE(holder == NULL) && !--holder->refcnt) {
>  		del_symlink(disk->slave_dir, bdev_kobj(bdev));
> -		del_symlink(bdev->bd_part->holder_dir,
> -			    &disk_to_dev(disk)->kobj);
> -		kobject_put(bdev->bd_part->holder_dir);
> +		del_symlink(bdev->bd_holder_dir, &disk_to_dev(disk)->kobj);
> +		kobject_put(bdev->bd_holder_dir);
>  		list_del_init(&holder->list);
>  		kfree(holder);
>  	}
> diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
> index 2f8ede04e5a94c..c0591e52d7d7ce 100644
> --- a/include/linux/blk_types.h
> +++ b/include/linux/blk_types.h
> @@ -35,6 +35,7 @@ struct block_device {
>  #ifdef CONFIG_SYSFS
>  	struct list_head	bd_holder_disks;
>  #endif
> +	struct kobject		*bd_holder_dir;
>  	u8			bd_partno;
>  	struct hd_struct *	bd_part;
>  	/* number of times partitions within this device have been opened. */
> diff --git a/include/linux/genhd.h b/include/linux/genhd.h
> index 30d7076155b4d2..b4a5c05593b99c 100644
> --- a/include/linux/genhd.h
> +++ b/include/linux/genhd.h
> @@ -55,7 +55,6 @@ struct hd_struct {
>  
>  	struct block_device *bdev;
>  	struct device __dev;
> -	struct kobject *holder_dir;
>  	int policy, partno;
>  #ifdef CONFIG_FAIL_MAKE_REQUEST
>  	int make_it_fail;
> -- 
> 2.29.2
> 
-- 
Jan Kara <jack@suse.com>
SUSE Labs, CR

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel


  reply index

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-26 13:03 [dm-devel] merge struct block_device and struct hd_struct v3 Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 01/44] blk-cgroup: fix a hd_struct leak in blkcg_fill_root_iostats Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 02/44] filemap: consistently use ->f_mapping over ->i_mapping Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 03/44] fs: remove get_super_thawed and get_super_exclusive_thawed Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 04/44] fs: simplify freeze_bdev/thaw_bdev Christoph Hellwig
2020-11-26 14:13   ` Jan Kara
2020-11-26 13:03 ` [dm-devel] [PATCH 05/44] mtip32xx: remove the call to fsync_bdev on removal Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 06/44] zram: do not call set_blocksize Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 07/44] loop: " Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 08/44] dm: simplify flush_bio initialization in __send_empty_flush Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [PATCH 14/44] block: use put_device in put_disk Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 15/44] block: change the hash used for looking up block devices Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 16/44] init: refactor name_to_dev_t Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 17/44] init: refactor devt_from_partuuid Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 18/44] init: cleanup match_dev_by_uuid and match_dev_by_label Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 19/44] block: refactor __blkdev_put Christoph Hellwig
2020-11-26 13:03 ` [dm-devel] [PATCH 20/44] block: refactor blkdev_get Christoph Hellwig
2020-11-26 14:55   ` Jan Kara
2020-11-26 13:03 ` [dm-devel] [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 ` [dm-devel] [PATCH 22/44] block: opencode devcgroup_inode_permission Christoph Hellwig
2020-11-26 15:07   ` Jan Kara
2020-11-26 13:04 ` [dm-devel] [PATCH 23/44] block: remove i_bdev Christoph Hellwig
2020-11-26 15:45   ` Jan Kara
2020-11-26 13:04 ` [dm-devel] [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 ` [dm-devel] [PATCH 25/44] block: remove ->bd_contains Christoph Hellwig
2020-11-26 13:04 ` [dm-devel] [PATCH 26/44] block: simplify the block device claiming interface Christoph Hellwig
2020-11-26 13:04 ` [dm-devel] [PATCH 27/44] block: simplify part_to_disk Christoph Hellwig
2020-11-26 16:36   ` Jan Kara
2020-11-26 13:04 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [PATCH 32/44] block: move the partition_meta_info " Christoph Hellwig
2020-11-26 16:58   ` Jan Kara
2020-11-26 13:04 ` [dm-devel] [PATCH 33/44] block: move holder_dir " Christoph Hellwig
2020-11-26 17:00   ` Jan Kara [this message]
2020-11-26 13:04 ` [dm-devel] [PATCH 34/44] block: move make_it_fail " Christoph Hellwig
2020-11-26 17:01   ` Jan Kara
2020-11-26 13:04 ` [dm-devel] [PATCH 35/44] block: move the policy field " Christoph Hellwig
2020-11-26 17:03   ` Jan Kara
2020-11-26 13:04 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [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 ` [dm-devel] [PATCH 42/44] f2fs: remove a few bd_part checks Christoph Hellwig
2020-11-26 13:04 ` [dm-devel] [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 ` [dm-devel] [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=20201126170042.GS422@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

DM-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/dm-devel/0 dm-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dm-devel dm-devel/ https://lore.kernel.org/dm-devel \
		dm-devel@redhat.com
	public-inbox-index dm-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/com.redhat.dm-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git