From 5cfda1c73a62f05c2b52feb4d00b194b26ccdc1f Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 29 Nov 2011 03:20:41 -0500 Subject: [PATCH] --- yaml --- r: 286519 b: refs/heads/master c: 2e88efd3aaafa0df05593cdfa5fd17afe922781d h: refs/heads/master i: 286517: db37f613c9ca987e332a2622d269822e264d285c 286515: df4655457d5d68fbc149d664de7d4a5ba3336fd0 286511: cd29799299c95cf00cb02d40e1d40b92fbd2aaea v: v3 --- [refs] | 2 +- trunk/drivers/target/loopback/tcm_loop.c | 8 ++++---- trunk/drivers/target/loopback/tcm_loop.h | 11 +---------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index ec9b1d326385..5a8449a34af4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0877eafd1618ef683e2ff2273acdeca5f1b077b9 +refs/heads/master: 2e88efd3aaafa0df05593cdfa5fd17afe922781d diff --git a/trunk/drivers/target/loopback/tcm_loop.c b/trunk/drivers/target/loopback/tcm_loop.c index 572d27a6b7ae..c47ff7f59e57 100644 --- a/trunk/drivers/target/loopback/tcm_loop.c +++ b/trunk/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/trunk/drivers/target/loopback/tcm_loop.h b/trunk/drivers/target/loopback/tcm_loop.h index 6b76c7a22bb0..15a036441471 100644 --- a/trunk/drivers/target/loopback/tcm_loop.h +++ b/trunk/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 */