[PATCH 28/45] block: simplify part_to_disk

Christoph Hellwig
2020-11-28T22:11:09Z

Now that struct hd_struct has a block_device pointer use that to
find the disk.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Acked-by: Tejun Heo <tj@kernel.org>
---
include/linux/genhd.h | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 42a51653c7303e..6ba91ee54cb2f6 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -218,13 +218,9 @@ struct gendisk {

static inline struct gendisk *part_to_disk(struct hd_struct *part)
{
- if (likely(part)) {
- if (part->partno)
- return dev_to_disk(part_to_dev(part)->parent);
- else
- return dev_to_disk(part_to_dev(part));
- }
- return NULL;
+ if (unlikely(!part))
+ return NULL;
+ return part->bdev->bd_disk;
}

static inline int disk_max_parts(struct gendisk *disk)
--
2.29.2