From 2c9cfa303c954e331ced6ca6ae5f9e67c9b52ab0 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 4 Sep 2014 13:06:38 +0000 Subject: [PATCH] iscsi-scst: Micro-optimize cmnd_prepare_recv_pdu() (merge r5735 from trunk) git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@5771 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index aec762aac..17f4fa971 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -1562,11 +1562,11 @@ static int cmnd_prepare_recv_pdu(struct iscsi_conn *conn, offset = 0; } - addr = (char __force __user *)(sg_virt(&sg[idx])); + addr = (char __force __user *)(page_address(sg_page(&sg[idx]))); EXTRACHECKS_BUG_ON(addr == NULL); sg_len = sg[idx].offset + sg[idx].length - offset; - conn->read_iov[i].iov_base = addr + offset - sg[idx].offset; + conn->read_iov[i].iov_base = addr + offset; if (size <= sg_len) { TRACE_DBG("idx=%d, i=%d, offset=%u, size=%d, addr=%p",