scsi: target: iblock: Fold iblock_emulate_read_cap_with_block_size() into iblock_get_...

Fold iblock_emulate_read_cap_with_block_size() into its only caller.

Link: https://lore.kernel.org/r/20220927082225.271975-1-hch@lst.de
Reviewed-by: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 8351c97..d9266cf 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -230,14 +230,12 @@ static void iblock_unplug_device(struct se_dev_plug *se_plug)
        clear_bit(IBD_PLUGF_PLUGGED, &ib_dev_plug->flags);
 }
 
-static unsigned long long iblock_emulate_read_cap_with_block_size(
-       struct se_device *dev,
-       struct block_device *bd,
-       struct request_queue *q)
+static sector_t iblock_get_blocks(struct se_device *dev)
 {
-       u32 block_size = bdev_logical_block_size(bd);
+       struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
+       u32 block_size = bdev_logical_block_size(ib_dev->ibd_bd);
        unsigned long long blocks_long =
-               div_u64(bdev_nr_bytes(bd), block_size) - 1;
+               div_u64(bdev_nr_bytes(ib_dev->ibd_bd), block_size) - 1;
 
        if (block_size == dev->dev_attrib.block_size)
                return blocks_long;
@@ -829,15 +827,6 @@ fail:
        return TCM_LOGICAL_UNIT_COMMUNICATION_FAILURE;
 }
 
-static sector_t iblock_get_blocks(struct se_device *dev)
-{
-       struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
-       struct block_device *bd = ib_dev->ibd_bd;
-       struct request_queue *q = bdev_get_queue(bd);
-
-       return iblock_emulate_read_cap_with_block_size(dev, bd, q);
-}
-
 static sector_t iblock_get_alignment_offset_lbas(struct se_device *dev)
 {
        struct iblock_dev *ib_dev = IBLOCK_DEV(dev);