Re: [Qemu-block] [PATCH 1/2] block/nfs: convert to preadv / pwritev

[Jeff Cody]

On Fri, Feb 17, 2017 at 05:39:00PM +0100, Peter Lieven wrote:
> Signed-off-by: Peter Lieven <address@hidden>
> ---
>  block/nfs.c | 33 +++++++++++++++------------------
>  1 file changed, 15 insertions(+), 18 deletions(-)
> 
> diff --git a/block/nfs.c b/block/nfs.c
> index 689eaa7..ab5dcc2 100644
> --- a/block/nfs.c
> +++ b/block/nfs.c
> @@ -256,9 +256,9 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void 
> *data,
>                              nfs_co_generic_bh_cb, task);
>  }
>  
> -static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
> -                                     int64_t sector_num, int nb_sectors,
> -                                     QEMUIOVector *iov)
> +static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
> +                                      uint64_t bytes, QEMUIOVector *iov,
> +                                      int flags)
>  {
>      NFSClient *client = bs->opaque;
>      NFSRPC task;
> @@ -267,9 +267,7 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
>      task.iov = iov;
>  
>      if (nfs_pread_async(client->context, client->fh,
> -                        sector_num * BDRV_SECTOR_SIZE,
> -                        nb_sectors * BDRV_SECTOR_SIZE,
> -                        nfs_co_generic_cb, &task) != 0) {
> +                        offset, bytes, nfs_co_generic_cb, &task) != 0) {
>          return -ENOMEM;
>      }
>  
> @@ -290,9 +288,9 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
>      return 0;
>  }
>  
> -static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
> -                                        int64_t sector_num, int nb_sectors,
> -                                        QEMUIOVector *iov)
> +static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
> +                                       uint64_t bytes, QEMUIOVector *iov,
> +                                       int flags)
>  {
>      NFSClient *client = bs->opaque;
>      NFSRPC task;
> @@ -300,17 +298,16 @@ static int coroutine_fn nfs_co_writev(BlockDriverState 
> *bs,
>  
>      nfs_co_init_task(bs, &task);
>  
> -    buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE);
> -    if (nb_sectors && buf == NULL) {
> +    buf = g_try_malloc(bytes);
> +    if (bytes && buf == NULL) {
>          return -ENOMEM;
>      }
>  
> -    qemu_iovec_to_buf(iov, 0, buf, nb_sectors * BDRV_SECTOR_SIZE);
> +    qemu_iovec_to_buf(iov, 0, buf, bytes);
>  
>      if (nfs_pwrite_async(client->context, client->fh,
> -                         sector_num * BDRV_SECTOR_SIZE,
> -                         nb_sectors * BDRV_SECTOR_SIZE,
> -                         buf, nfs_co_generic_cb, &task) != 0) {
> +                         offset, bytes, buf,
> +                         nfs_co_generic_cb, &task) != 0) {
>          g_free(buf);
>          return -ENOMEM;
>      }
> @@ -322,7 +319,7 @@ static int coroutine_fn nfs_co_writev(BlockDriverState 
> *bs,
>  
>      g_free(buf);
>  
> -    if (task.ret != nb_sectors * BDRV_SECTOR_SIZE) {
> +    if (task.ret != bytes) {
>          return task.ret < 0 ? task.ret : -EIO;
>      }
>  
> @@ -856,8 +853,8 @@ static BlockDriver bdrv_nfs = {
>      .bdrv_create                    = nfs_file_create,
>      .bdrv_reopen_prepare            = nfs_reopen_prepare,
>  
> -    .bdrv_co_readv                  = nfs_co_readv,
> -    .bdrv_co_writev                 = nfs_co_writev,
> +    .bdrv_co_preadv                 = nfs_co_preadv,
> +    .bdrv_co_pwritev                = nfs_co_pwritev,
>      .bdrv_co_flush_to_disk          = nfs_co_flush,
>  
>      .bdrv_detach_aio_context        = nfs_detach_aio_context,
> -- 
> 1.9.1
>

Reviewed-by: Jeff Cody <address@hidden>