diff mbox series

target/iblock: fold iblock_emulate_read_cap_with_block_size into iblock_get_blocks

Message ID 20220927082225.271975-1-hch@lst.de (mailing list archive)
State Accepted
Headers show
Series target/iblock: fold iblock_emulate_read_cap_with_block_size into iblock_get_blocks | expand

Commit Message

Christoph Hellwig Sept. 27, 2022, 8:22 a.m. UTC 
Fold iblock_emulate_read_cap_with_block_size into its only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/target/target_core_iblock.c | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

Comments

Mike Christie Sept. 28, 2022, 7:14 p.m. UTC | #1 
On 9/27/22 3:22 AM, Christoph Hellwig wrote:
> Fold iblock_emulate_read_cap_with_block_size into its only caller.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/target/target_core_iblock.c | 19 ++++---------------
>  1 file changed, 4 insertions(+), 15 deletions(-)
>

Reviewed-by: Mike Christie <michael.christie@oracle.com>
Martin K. Petersen Oct. 1, 2022, 9:52 a.m. UTC | #2 
Christoph,

> Fold iblock_emulate_read_cap_with_block_size into its only caller.

Applied to 6.1/scsi-staging, thanks!
diff mbox series

Patch

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 8351c974cee32..d9266cf558dcb 100644
--- 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 @@  iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
 	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);