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>

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index 814a85b954f0585afd9435058e1311438356f3d3..d43fc910a4faaaa778beb2a3056212f090b2f964 100644 (file)
--- 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 6b6d17bb1fd6a200b8a359e3cc08d5ad3c3d80ed..a69b7c28de929842b67db799e79ce42d13e18cdf 100644 (file)
--- 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