From: Geliang Tang <geliangtang@gmail.com>
Date: Sat, 22 Apr 2017 01:21:13 +0000 (+0800)
Subject: xen/scsifront: use offset_in_page() macro
X-Git-Tag: v4.1.12-111.0.20170918_2215~223
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=31216213da9063f0361e5ddafdaabcf70cc45923;p=users%2Fjedix%2Flinux-maple.git

xen/scsifront: use offset_in_page() macro

Use offset_in_page() macro instead of open-coding.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>

OraBug: 26662731

(cherry picked from commit 6483e3135a693548874429db901c0544d3a9b4cd)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Joao Martins <joao.m.martins@oracle.com>
---

diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 9aa1fe1fc9396..a6a8b60d4902a 100644
--- a/drivers/scsi/xen-scsifront.c
+++ b/drivers/scsi/xen-scsifront.c
@@ -434,7 +434,7 @@ static int map_data_for_request(struct vscsifrnt_info *info,
 
 	if (seg_grants) {
 		page = virt_to_page(seg);
-		off = (unsigned long)seg & ~PAGE_MASK;
+		off = offset_in_page(seg);
 		len = sizeof(struct scsiif_request_segment) * data_grants;
 		while (len > 0) {
 			bytes = min_t(unsigned int, len, PAGE_SIZE - off);