Commit c64dc3bd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

block: simplify part_to_disk

Now that struct hd_struct has a block_device pointer use that to
find the disk.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 37c3fc9a
......@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment