summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorErez Zilber2006-09-11 11:19:17 +0200
committerRoland Dreier2006-09-23 00:22:49 +0200
commit777a71dd4d901f055967ddbd038d2a74ffce0eb8 (patch)
tree88c05b9d52619a4881c12c752b55ed124f782fc0 /drivers/infiniband
parentRDMA/cma: Protect against adding device during destruction (diff)
downloadkernel-qcow2-linux-777a71dd4d901f055967ddbd038d2a74ffce0eb8.tar.gz
kernel-qcow2-linux-777a71dd4d901f055967ddbd038d2a74ffce0eb8.tar.xz
kernel-qcow2-linux-777a71dd4d901f055967ddbd038d2a74ffce0eb8.zip
IB/iser: fix a check of SG alignment for RDMA
dma mapping may include a "compaction" of the sg associated with scsi command. Hence, the size of the maximal prefix of the SG which is aligned for rdma must be compared against the length of the dma mapped sg (mem->dma_nents) and not against the size of it before it was mapped (mem->size). Signed-off-by: Erez Zilber <erezz@voltaire.com> Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/ulp/iser/iser_memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/infiniband/ulp/iser/iser_memory.c b/drivers/infiniband/ulp/iser/iser_memory.c
index 31950a522a1c..53af9567632e 100644
--- a/drivers/infiniband/ulp/iser/iser_memory.c
+++ b/drivers/infiniband/ulp/iser/iser_memory.c
@@ -378,7 +378,7 @@ int iser_reg_rdma_mem(struct iscsi_iser_cmd_task *iser_ctask,
regd_buf = &iser_ctask->rdma_regd[cmd_dir];
aligned_len = iser_data_buf_aligned_len(mem);
- if (aligned_len != mem->size) {
+ if (aligned_len != mem->dma_nents) {
iser_err("rdma alignment violation %d/%d aligned\n",
aligned_len, mem->size);
iser_data_buf_dump(mem);