DM-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-bcache@vger.kernel.org, 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>
Subject: [dm-devel] [PATCH 12/44] block: add a bdev_kobj helper
Date: Thu, 26 Nov 2020 14:03:50 +0100
Message-ID: <20201126130422.92945-13-hch@lst.de> (raw)
In-Reply-To: <20201126130422.92945-1-hch@lst.de>

Add a little helper to find the kobject for a struct block_device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Jan Kara <jack@suse.cz>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Coly Li <colyli@suse.de>		[bcache]
---
 drivers/md/bcache/super.c |  7 ++-----
 drivers/md/md.c           |  4 +---
 fs/block_dev.c            |  6 +++---
 fs/btrfs/sysfs.c          | 15 +++------------
 include/linux/blk_types.h |  3 +++
 5 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index 46a00134a36ae1..a6a5e21e4fd136 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -1447,8 +1447,7 @@ static int register_bdev(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
 		goto err;
 
 	err = "error creating kobject";
-	if (kobject_add(&dc->disk.kobj, &part_to_dev(bdev->bd_part)->kobj,
-			"bcache"))
+	if (kobject_add(&dc->disk.kobj, bdev_kobj(bdev), "bcache"))
 		goto err;
 	if (bch_cache_accounting_add_kobjs(&dc->accounting, &dc->disk.kobj))
 		goto err;
@@ -2342,9 +2341,7 @@ static int register_cache(struct cache_sb *sb, struct cache_sb_disk *sb_disk,
 		goto err;
 	}
 
-	if (kobject_add(&ca->kobj,
-			&part_to_dev(bdev->bd_part)->kobj,
-			"bcache")) {
+	if (kobject_add(&ca->kobj, bdev_kobj(bdev), "bcache")) {
 		err = "error calling kobject_add";
 		ret = -ENOMEM;
 		goto out;
diff --git a/drivers/md/md.c b/drivers/md/md.c
index b2edf5e0f965b5..7ce6047c856ea2 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -2414,7 +2414,6 @@ EXPORT_SYMBOL(md_integrity_add_rdev);
 static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
 {
 	char b[BDEVNAME_SIZE];
-	struct kobject *ko;
 	int err;
 
 	/* prevent duplicates */
@@ -2477,9 +2476,8 @@ static int bind_rdev_to_array(struct md_rdev *rdev, struct mddev *mddev)
 	if ((err = kobject_add(&rdev->kobj, &mddev->kobj, "dev-%s", b)))
 		goto fail;
 
-	ko = &part_to_dev(rdev->bdev->bd_part)->kobj;
 	/* failure here is OK */
-	err = sysfs_create_link(&rdev->kobj, ko, "block");
+	err = sysfs_create_link(&rdev->kobj, bdev_kobj(rdev->bdev), "block");
 	rdev->sysfs_state = sysfs_get_dirent_safe(rdev->kobj.sd, "state");
 	rdev->sysfs_unack_badblocks =
 		sysfs_get_dirent_safe(rdev->kobj.sd, "unacknowledged_bad_blocks");
diff --git a/fs/block_dev.c b/fs/block_dev.c
index 33c29106c98907..c5755150c6be62 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1242,7 +1242,7 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk)
 	holder->disk = disk;
 	holder->refcnt = 1;
 
-	ret = add_symlink(disk->slave_dir, &part_to_dev(bdev->bd_part)->kobj);
+	ret = add_symlink(disk->slave_dir, bdev_kobj(bdev));
 	if (ret)
 		goto out_free;
 
@@ -1259,7 +1259,7 @@ int bd_link_disk_holder(struct block_device *bdev, struct gendisk *disk)
 	goto out_unlock;
 
 out_del:
-	del_symlink(disk->slave_dir, &part_to_dev(bdev->bd_part)->kobj);
+	del_symlink(disk->slave_dir, bdev_kobj(bdev));
 out_free:
 	kfree(holder);
 out_unlock:
@@ -1287,7 +1287,7 @@ void bd_unlink_disk_holder(struct block_device *bdev, struct gendisk *disk)
 	holder = bd_find_holder_disk(bdev, disk);
 
 	if (!WARN_ON_ONCE(holder == NULL) && !--holder->refcnt) {
-		del_symlink(disk->slave_dir, &part_to_dev(bdev->bd_part)->kobj);
+		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);
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index 279d9262b676d4..24b6c6dc69000a 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -1232,8 +1232,6 @@ int btrfs_sysfs_add_space_info_type(struct btrfs_fs_info *fs_info,
 
 void btrfs_sysfs_remove_device(struct btrfs_device *device)
 {
-	struct hd_struct *disk;
-	struct kobject *disk_kobj;
 	struct kobject *devices_kobj;
 
 	/*
@@ -1243,11 +1241,8 @@ void btrfs_sysfs_remove_device(struct btrfs_device *device)
 	devices_kobj = device->fs_info->fs_devices->devices_kobj;
 	ASSERT(devices_kobj);
 
-	if (device->bdev) {
-		disk = device->bdev->bd_part;
-		disk_kobj = &part_to_dev(disk)->kobj;
-		sysfs_remove_link(devices_kobj, disk_kobj->name);
-	}
+	if (device->bdev)
+		sysfs_remove_link(devices_kobj, bdev_kobj(device->bdev)->name);
 
 	if (device->devid_kobj.state_initialized) {
 		kobject_del(&device->devid_kobj);
@@ -1353,11 +1348,7 @@ int btrfs_sysfs_add_device(struct btrfs_device *device)
 	nofs_flag = memalloc_nofs_save();
 
 	if (device->bdev) {
-		struct hd_struct *disk;
-		struct kobject *disk_kobj;
-
-		disk = device->bdev->bd_part;
-		disk_kobj = &part_to_dev(disk)->kobj;
+		struct kobject *disk_kobj = bdev_kobj(device->bdev);
 
 		ret = sysfs_create_link(devices_kobj, disk_kobj, disk_kobj->name);
 		if (ret) {
diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
index ebfb4e7c1fd125..9698f459cc65c9 100644
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
@@ -49,6 +49,9 @@ struct block_device {
 	struct super_block	*bd_fsfreeze_sb;
 } __randomize_layout;
 
+#define bdev_kobj(_bdev) \
+	(&part_to_dev((_bdev)->bd_part)->kobj)
+
 /*
  * Block error status values.  See block/blk-core:blk_errors for the details.
  * Alpha cannot write a byte atomically, so we need to use 32-bit value.
-- 
2.29.2

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


  parent 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 ` Christoph Hellwig [this message]
2020-11-26 14:47   ` [dm-devel] [PATCH 12/44] block: add a bdev_kobj helper 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
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=20201126130422.92945-13-hch@lst.de \
    --to=hch@lst.de \
    --cc=axboe@kernel.dk \
    --cc=colyli@suse.de \
    --cc=dm-devel@redhat.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jack@suse.com \
    --cc=jack@suse.cz \
    --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