diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-06-22 01:32:20 -0700 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-07-22 09:37:45 +0000 |
| commit | 8f3d14e2b0352e41c8e64a39c95c7d9498c96e89 (patch) | |
| tree | 607a72e745b87c18a9e594e9f3c8167ffdbb42bf | |
| parent | 5e1be919820175a2becc3c72051050aaa3fae954 (diff) | |
target/iblock: Use request_queue->nr_request for se_device defaults
This patch converts iblock_create_virtdevice() to use request_queue->nr_request
for se_dev_limits usage of ->hw_queue_depth and ->queue_depth for individual
struct se_device export.
It also removes the now unused defines for IBLOCK_DEVICE_QUEUE_DEPTH and
IBLOCK_MAX_DEVICE_QUEUE_DEPTH
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
| -rw-r--r-- | drivers/target/target_core_iblock.c | 4 | ||||
| -rw-r--r-- | drivers/target/target_core_iblock.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c index 814a85b954f..d43fc910a4f 100644 --- a/drivers/target/target_core_iblock.c +++ b/drivers/target/target_core_iblock.c @@ -164,8 +164,8 @@ static struct se_device *iblock_create_virtdevice( limits->logical_block_size = bdev_logical_block_size(bd); limits->max_hw_sectors = queue_max_hw_sectors(q); limits->max_sectors = queue_max_sectors(q); - dev_limits.hw_queue_depth = IBLOCK_MAX_DEVICE_QUEUE_DEPTH; - dev_limits.queue_depth = IBLOCK_DEVICE_QUEUE_DEPTH; + dev_limits.hw_queue_depth = q->nr_requests; + dev_limits.queue_depth = q->nr_requests; ib_dev->ibd_major = MAJOR(bd->bd_dev); ib_dev->ibd_minor = MINOR(bd->bd_dev); diff --git a/drivers/target/target_core_iblock.h b/drivers/target/target_core_iblock.h index 6b6d17bb1fd..a69b7c28de9 100644 --- a/drivers/target/target_core_iblock.h +++ b/drivers/target/target_core_iblock.h @@ -3,8 +3,6 @@ #define IBLOCK_VERSION "4.0" -#define IBLOCK_DEVICE_QUEUE_DEPTH 32 -#define IBLOCK_MAX_DEVICE_QUEUE_DEPTH 128 #define IBLOCK_MAX_CDBS 16 #define IBLOCK_LBA_SHIFT 9 |