Commit f915f58e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Martin K. Petersen
Browse files

scsi: target: iblock: Fold iblock_emulate_read_cap_with_block_size() into iblock_get_blocks() 

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: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 3ddeabd1

drivers/target/target_core_iblock.c

+4 −15
Original line number Diff line number Diff line
@@ -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);