Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszer...

[karo-tx-linux.git] / drivers / scsi / xen-scsifront.c

diff --git a/drivers/scsi/xen-scsifront.c b/drivers/scsi/xen-scsifront.c
index 9aa1fe1fc93967109256690be004d31fa04b52e7..a6a8b60d4902ab018442ab41acb99a9369c63146 100644 (file)
--- 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);