aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/vhost
diff options
context:
space:
mode:
authorAsias He <asias@redhat.com>2013-01-21 22:20:26 -0500
committerNicholas Bellinger <nab@linux-iscsi.org>2013-02-13 14:27:41 -0500
commitf3158f362ca8b77b24c5de86cbec347ab2bb6430 (patch)
tree7475677803571df7f23d3c1efdc309a82311178f /drivers/vhost
parent765b34fdc1507add8fd6f1007410e7a375d0f89c (diff)
tcm_vhost: Use iov_num_pages to calculate sgl_count
Signed-off-by: Asias He <asias@redhat.com> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers/vhost')
-rw-r--r--drivers/vhost/tcm_vhost.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/vhost/tcm_vhost.c b/drivers/vhost/tcm_vhost.c
index defc28595656..62058d7a562f 100644
--- a/drivers/vhost/tcm_vhost.c
+++ b/drivers/vhost/tcm_vhost.c
@@ -479,11 +479,9 @@ static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
479 * Find out how long sglist needs to be 479 * Find out how long sglist needs to be
480 */ 480 */
481 sgl_count = 0; 481 sgl_count = 0;
482 for (i = 0; i < niov; i++) { 482 for (i = 0; i < niov; i++)
483 sgl_count += (((uintptr_t)iov[i].iov_base + iov[i].iov_len + 483 sgl_count += iov_num_pages(&iov[i]);
484 PAGE_SIZE - 1) >> PAGE_SHIFT) - 484
485 ((uintptr_t)iov[i].iov_base >> PAGE_SHIFT);
486 }
487 /* TODO overflow checking */ 485 /* TODO overflow checking */
488 486
489 sg = kmalloc(sizeof(tv_cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC); 487 sg = kmalloc(sizeof(tv_cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC);