lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tcm_vhost: Use iov_num_pages to calculate sgl_count

Browse Source 
Signed-off-by: Asias He <asias@redhat.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Asias He
2013-01-22 11:20:26 +08:00
committed by Nicholas Bellinger
parent 765b34fdc1
commit f3158f362c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/vhost/tcm_vhost.c
View File

@@ -479,11 +479,9 @@ static int vhost_scsi_map_iov_to_sgl(struct tcm_vhost_cmd *tv_cmd,
* Find out how long sglist needs to be * Find out how long sglist needs to be
*/ */
sgl_count = 0; sgl_count = 0;
for (i = 0; i < niov; i++) { for (i = 0; i < niov; i++)
sgl_count += (((uintptr_t)iov[i].iov_base + iov[i].iov_len + sgl_count += iov_num_pages(&iov[i]);
PAGE_SIZE - 1) >> PAGE_SHIFT) -
((uintptr_t)iov[i].iov_base >> PAGE_SHIFT);
}
/* TODO overflow checking */ /* TODO overflow checking */
sg = kmalloc(sizeof(tv_cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC); sg = kmalloc(sizeof(tv_cmd->tvc_sgl[0]) * sgl_count, GFP_ATOMIC);