On Tue, Apr 25, 2017 at 12:21:02PM -0600, Logan Gunthorpe wrote:
> Straightforward conversion to the new helper, except due to the lack
> of error path, we have to use SG_MAP_MUST_NOT_FAIL which may BUG_ON in
> certain cases in the future.
> 
> Signed-off-by: Logan Gunthorpe <log...@deltatee.com>
> Cc: Boris Ostrovsky <boris.ostrov...@oracle.com>
> Cc: Juergen Gross <jgr...@suse.com>
> Cc: Konrad Rzeszutek Wilk <konrad.w...@oracle.com>
> Cc: "Roger Pau Monné" <roger....@citrix.com>
> ---
>  drivers/block/xen-blkfront.c | 20 +++++++++++---------
>  1 file changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
> index 3945963..ed62175 100644
> --- a/drivers/block/xen-blkfront.c
> +++ b/drivers/block/xen-blkfront.c
> @@ -816,8 +816,9 @@ static int blkif_queue_rw_req(struct request *req, struct 
> blkfront_ring_info *ri
>               BUG_ON(sg->offset + sg->length > PAGE_SIZE);
>  
>               if (setup.need_copy) {
> -                     setup.bvec_off = sg->offset;
> -                     setup.bvec_data = kmap_atomic(sg_page(sg));
> +                     setup.bvec_off = 0;
> +                     setup.bvec_data = sg_map(sg, 0, SG_KMAP_ATOMIC |
> +                                              SG_MAP_MUST_NOT_FAIL);

I assume that sg_map already adds sg->offset to the address?

Also wondering whether we can get rid of bvec_off and just increment bvec_data,
adding Julien who IIRC added this code.

>               }
>  
>               gnttab_foreach_grant_in_range(sg_page(sg),
> @@ -827,7 +828,7 @@ static int blkif_queue_rw_req(struct request *req, struct 
> blkfront_ring_info *ri
>                                             &setup);
>  
>               if (setup.need_copy)
> -                     kunmap_atomic(setup.bvec_data);
> +                     sg_unmap(sg, setup.bvec_data, 0, SG_KMAP_ATOMIC);
>       }
>       if (setup.segments)
>               kunmap_atomic(setup.segments);
> @@ -1053,7 +1054,7 @@ static int xen_translate_vdev(int vdevice, int *minor, 
> unsigned int *offset)
>               case XEN_SCSI_DISK5_MAJOR:
>               case XEN_SCSI_DISK6_MAJOR:
>               case XEN_SCSI_DISK7_MAJOR:
> -                     *offset = (*minor / PARTS_PER_DISK) + 
> +                     *offset = (*minor / PARTS_PER_DISK) +
>                               ((major - XEN_SCSI_DISK1_MAJOR + 1) * 16) +
>                               EMULATED_SD_DISK_NAME_OFFSET;
>                       *minor = *minor +
> @@ -1068,7 +1069,7 @@ static int xen_translate_vdev(int vdevice, int *minor, 
> unsigned int *offset)
>               case XEN_SCSI_DISK13_MAJOR:
>               case XEN_SCSI_DISK14_MAJOR:
>               case XEN_SCSI_DISK15_MAJOR:
> -                     *offset = (*minor / PARTS_PER_DISK) + 
> +                     *offset = (*minor / PARTS_PER_DISK) +
>                               ((major - XEN_SCSI_DISK8_MAJOR + 8) * 16) +
>                               EMULATED_SD_DISK_NAME_OFFSET;
>                       *minor = *minor +
> @@ -1119,7 +1120,7 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,
>       if (!VDEV_IS_EXTENDED(info->vdevice)) {
>               err = xen_translate_vdev(info->vdevice, &minor, &offset);
>               if (err)
> -                     return err;             
> +                     return err;

Cosmetic changes should go in a separate patch please.

Roger.

-- 
You received this message because you are subscribed to the Google Groups 
"open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to open-iscsi+unsubscr...@googlegroups.com.
To post to this group, send email to open-iscsi@googlegroups.com.
Visit this group at https://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.

Reply via email to