[28/45] block: simplify part_to_disk

Commit Message

Christoph Hellwig Nov. 24, 2020, 1:27 p.m. UTC

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

Signed-off-by: Christoph Hellwig <[e-mail]>
---
 include/linux/genhd.h | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

Comments

Tejun Heo Nov. 24, 2020, 9:20 p.m. UTC | #1

On Tue, Nov 24, 2020 at 02:27:34PM +0100, Christoph Hellwig wrote:
> Now that struct hd_struct has a block_device pointer use that to
> find the disk.
> 
> Signed-off-by: Christoph Hellwig <[e-mail]>

Acked-by: Tejun Heo <[e-mail]>

Patch

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index d068e46f9086ae..dcf86a3d4dedc4 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -219,13 +219,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)