tcm_loop: bump max_sectors

There is not reason to artifically limit max_sectors in tcm_loop, set
it to UINT_MAX to allow stressing the large I/O handling in the target
core using the loopback driver.  Also remove various superflous defines
hiding the values set in the host template.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>

diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c
index 572d27a6b7ae9ed00bf51638c7375b6099224025..c47ff7f59e5733226702004617327a28b566f7f1 100644 (file)
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
@@ -416,11 +416,11 @@ static struct scsi_host_template tcm_loop_driver_template = {
        .queuecommand           = tcm_loop_queuecommand,
        .change_queue_depth     = tcm_loop_change_queue_depth,
        .eh_device_reset_handler = tcm_loop_device_reset,
-       .can_queue              = TL_SCSI_CAN_QUEUE,
+       .can_queue              = 1024,
        .this_id                = -1,
-       .sg_tablesize           = TL_SCSI_SG_TABLESIZE,
-       .cmd_per_lun            = TL_SCSI_CMD_PER_LUN,
-       .max_sectors            = TL_SCSI_MAX_SECTORS,
+       .sg_tablesize           = 256,
+       .cmd_per_lun            = 1024,
+       .max_sectors            = 0xFFFF,
        .use_clustering         = DISABLE_CLUSTERING,
        .slave_alloc            = tcm_loop_slave_alloc,
        .slave_configure        = tcm_loop_slave_configure,

diff --git a/drivers/target/loopback/tcm_loop.h b/drivers/target/loopback/tcm_loop.h
index 6b76c7a22bb062fa692a89e89d903b747e67e157..15a036441471d3aca51624e903ea19f8b7ca8941 100644 (file)
--- a/drivers/target/loopback/tcm_loop.h
+++ b/drivers/target/loopback/tcm_loop.h
@@ -1,16 +1,7 @@
 #define TCM_LOOP_VERSION               "v2.1-rc1"
 #define TL_WWN_ADDR_LEN                        256
 #define TL_TPGS_PER_HBA                        32
-/*
- * Defaults for struct scsi_host_template tcm_loop_driver_template
- *
- * We use large can_queue and cmd_per_lun here and let TCM enforce
- * the underlying se_device_t->queue_depth.
- */
-#define TL_SCSI_CAN_QUEUE              1024
-#define TL_SCSI_CMD_PER_LUN            1024
-#define TL_SCSI_MAX_SECTORS            1024
-#define TL_SCSI_SG_TABLESIZE           256
+
 /*
  * Used in tcm_loop_driver_probe() for struct Scsi_Host->max_cmd_len
  */