]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
target/iblock: use bdev_nr_bytes instead of open coding it
authorChristoph Hellwig <hch@lst.de>
Mon, 18 Oct 2021 10:11:08 +0000 (12:11 +0200)
committerJens Axboe <axboe@kernel.dk>
Mon, 18 Oct 2021 20:43:22 +0000 (14:43 -0600)
Use the proper helper to read the block device size.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Link: https://lore.kernel.org/r/20211018101130.1838532-9-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
drivers/target/target_core_iblock.c

index 31df20abe141f0f74d91de89fa6b770a09cf83a0..b1ef041cacd81c70da27e9bab48af1e46bce0abd 100644 (file)
@@ -232,9 +232,9 @@ static unsigned long long iblock_emulate_read_cap_with_block_size(
        struct block_device *bd,
        struct request_queue *q)
 {
-       unsigned long long blocks_long = (div_u64(i_size_read(bd->bd_inode),
-                                       bdev_logical_block_size(bd)) - 1);
        u32 block_size = bdev_logical_block_size(bd);
+       unsigned long long blocks_long =
+               div_u64(bdev_nr_bytes(bd), block_size) - 1;
 
        if (block_size == dev->dev_attrib.block_size)
                return blocks_long;