summaryrefslogtreecommitdiff
path: root/block/partitions/acorn.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2021-08-10 18:45:09 +0300
committerJens Axboe <axboe@kernel.dk>2021-08-12 19:31:35 +0300
commita08aa9bccdc282b5e8d133bf8c239473f057b464 (patch)
treebacbfd0d8f42786aed2fff06103c78aa3a98b3df /block/partitions/acorn.c
parent50b4aecfbbb09869db967e4a26212a47e10c0088 (diff)
downloadlinux-a08aa9bccdc282b5e8d133bf8c239473f057b464.tar.xz
block: store a gendisk in struct parsed_partitions
Partition scanning only happens on the whole device, so pass a struct gendisk instead of the whole device block_device to the scanners. This allows to simplify printing the device name in various places as the disk name is available in disk->name. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Stefan Haberland <sth@linux.ibm.com> Link: https://lore.kernel.org/r/20210810154512.1809898-2-hch@lst.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/partitions/acorn.c')
-rw-r--r--block/partitions/acorn.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/block/partitions/acorn.c b/block/partitions/acorn.c
index c64c57b958bf..2c381c694c57 100644
--- a/block/partitions/acorn.c
+++ b/block/partitions/acorn.c
@@ -275,7 +275,7 @@ int adfspart_check_ADFS(struct parsed_partitions *state)
/*
* Work out start of non-adfs partition.
*/
- nr_sects = (state->bdev->bd_inode->i_size >> 9) - start_sect;
+ nr_sects = get_capacity(state->disk) - start_sect;
if (start_sect) {
switch (id) {
@@ -540,7 +540,7 @@ int adfspart_check_EESOX(struct parsed_partitions *state)
if (i != 0) {
sector_t size;
- size = get_capacity(state->bdev->bd_disk);
+ size = get_capacity(state->disk);
put_partition(state, slot++, start, size - start);
strlcat(state->pp_buf, "\n", PAGE_SIZE);
}