Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7216dc07 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

target: Drop left-over fabric_max_sectors attribute 



Now that fabric_max_sectors is no longer used to enforce the maximum
I/O size, go ahead and drop it's left-over usage in target-core and
associated backend drivers.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Martin K. Petersen <martin.petersen@oracle.com>
Cc: Roland Dreier <roland@purestorage.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 046ba642

drivers/target/target_core_device.c

+0 −46
Original line number Diff line number Diff line
@@ -1103,51 +1103,6 @@ int se_dev_set_queue_depth(struct se_device *dev, u32 queue_depth) 
}

EXPORT_SYMBOL(se_dev_set_queue_depth);



int se_dev_set_fabric_max_sectors(struct se_device *dev, u32 fabric_max_sectors)

{

	int block_size = dev->dev_attrib.block_size;



	if (dev->export_count) {

		pr_err("dev[%p]: Unable to change SE Device"

			" fabric_max_sectors while export_count is %d\n",

			dev, dev->export_count);

		return -EINVAL;

	}

	if (!fabric_max_sectors) {

		pr_err("dev[%p]: Illegal ZERO value for"

			" fabric_max_sectors\n", dev);

		return -EINVAL;

	}

	if (fabric_max_sectors < DA_STATUS_MAX_SECTORS_MIN) {

		pr_err("dev[%p]: Passed fabric_max_sectors: %u less than"

			" DA_STATUS_MAX_SECTORS_MIN: %u\n", dev, fabric_max_sectors,

				DA_STATUS_MAX_SECTORS_MIN);

		return -EINVAL;

	}

	if (fabric_max_sectors > DA_STATUS_MAX_SECTORS_MAX) {

		pr_err("dev[%p]: Passed fabric_max_sectors: %u"

			" greater than DA_STATUS_MAX_SECTORS_MAX:"

			" %u\n", dev, fabric_max_sectors,

			DA_STATUS_MAX_SECTORS_MAX);

		return -EINVAL;

	}

	/*

	 * Align max_sectors down to PAGE_SIZE to follow transport_allocate_data_tasks()

	 */

	if (!block_size) {

		block_size = 512;

		pr_warn("Defaulting to 512 for zero block_size\n");

	}

	fabric_max_sectors = se_dev_align_max_sectors(fabric_max_sectors,

						      block_size);



	dev->dev_attrib.fabric_max_sectors = fabric_max_sectors;

	pr_debug("dev[%p]: SE Device max_sectors changed to %u\n",

			dev, fabric_max_sectors);

	return 0;

}

EXPORT_SYMBOL(se_dev_set_fabric_max_sectors);



int se_dev_set_optimal_sectors(struct se_device *dev, u32 optimal_sectors)

{

	if (dev->export_count) {
@@ -1553,7 +1508,6 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name) 
	dev->dev_attrib.unmap_granularity_alignment =

				DA_UNMAP_GRANULARITY_ALIGNMENT_DEFAULT;

	dev->dev_attrib.max_write_same_len = DA_MAX_WRITE_SAME_LEN;

	dev->dev_attrib.fabric_max_sectors = DA_FABRIC_MAX_SECTORS;



	xcopy_lun = &dev->xcopy_lun;

	xcopy_lun->lun_se_dev = dev;

drivers/target/target_core_file.c

+0 −1
Original line number Diff line number Diff line
@@ -968,7 +968,6 @@ static struct configfs_attribute *fileio_backend_dev_attrs[] = { 
	&fileio_dev_attrib_hw_block_size.attr,

	&fileio_dev_attrib_block_size.attr,

	&fileio_dev_attrib_hw_max_sectors.attr,

	&fileio_dev_attrib_fabric_max_sectors.attr,

	&fileio_dev_attrib_optimal_sectors.attr,

	&fileio_dev_attrib_hw_queue_depth.attr,

	&fileio_dev_attrib_queue_depth.attr,

drivers/target/target_core_iblock.c

+0 −1
Original line number Diff line number Diff line
@@ -883,7 +883,6 @@ static struct configfs_attribute *iblock_backend_dev_attrs[] = { 
	&iblock_dev_attrib_hw_block_size.attr,

	&iblock_dev_attrib_block_size.attr,

	&iblock_dev_attrib_hw_max_sectors.attr,

	&iblock_dev_attrib_fabric_max_sectors.attr,

	&iblock_dev_attrib_optimal_sectors.attr,

	&iblock_dev_attrib_hw_queue_depth.attr,

	&iblock_dev_attrib_queue_depth.attr,

drivers/target/target_core_rd.c

+0 −1
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ static struct configfs_attribute *rd_mcp_backend_dev_attrs[] = { 
	&rd_mcp_dev_attrib_hw_block_size.attr,

	&rd_mcp_dev_attrib_block_size.attr,

	&rd_mcp_dev_attrib_hw_max_sectors.attr,

	&rd_mcp_dev_attrib_fabric_max_sectors.attr,

	&rd_mcp_dev_attrib_optimal_sectors.attr,

	&rd_mcp_dev_attrib_hw_queue_depth.attr,

	&rd_mcp_dev_attrib_queue_depth.attr,

drivers/target/target_core_user.c

+0 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,6 @@ static struct configfs_attribute *tcmu_backend_dev_attrs[] = { 
	&tcmu_dev_attrib_hw_block_size.attr,

	&tcmu_dev_attrib_block_size.attr,

	&tcmu_dev_attrib_hw_max_sectors.attr,

	&tcmu_dev_attrib_fabric_max_sectors.attr,

	&tcmu_dev_attrib_optimal_sectors.attr,

	&tcmu_dev_attrib_hw_queue_depth.attr,

	&tcmu_dev_attrib_queue_depth.attr,