summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorSagi Grimberg <sagig@mellanox.com>2015-04-14 17:08:14 +0200
committerDoug Ledford <dledford@redhat.com>2015-04-15 22:07:12 +0200
commitecc3993a2ad2a4ce8f1a58a08e9177f21015492d (patch)
treeec9a8be87940c5ab655e2d03e2bfe649d6fb9cdb /drivers/infiniband
parentIB/iser: Fix wrong calculation of protection buffer length (diff)
downloadlinux-ecc3993a2ad2a4ce8f1a58a08e9177f21015492d.tar.xz
linux-ecc3993a2ad2a4ce8f1a58a08e9177f21015492d.zip
IB/iser: Remove redundant cmd_data_len calculation
This code was added before we had protection data length calculation (in iser_send_command), so we needed to calc the sg data length from the sg itself. This is not needed anymore. This patch does not change any functionality. Signed-off-by: Sagi Grimberg <sagig@mellanox.com> Signed-off-by: Adir Lev <adirl@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/ulp/iser/iser_memory.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 341040bf0984..32ccd5cea675 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -53,12 +53,9 @@ static int iser_start_rdma_unaligned_sg(struct iscsi_iser_task *iser_task,
struct scatterlist *sgl = (struct scatterlist *)data->buf;
struct scatterlist *sg;
char *mem = NULL;
- unsigned long cmd_data_len = 0;
+ unsigned long cmd_data_len = data->data_len;
int dma_nents, i;
- for_each_sg(sgl, sg, data->size, i)
- cmd_data_len += ib_sg_dma_len(dev, sg);
-
if (cmd_data_len > ISER_KMALLOC_THRESHOLD)
mem = (void *)__get_free_pages(GFP_ATOMIC,
ilog2(roundup_pow_of_two(cmd_data_len)) - PAGE_SHIFT);