falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

block/nfs: convert to preadv / pwritev 

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Message-id: 1487349541-10201-2-git-send-email-pl@kamp.de
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Peter Lieven 2017-02-17 17:39:00 +01:00 committed by Jeff Cody
parent fe8ee082db
commit 69785a229d
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
block/nfs.c
View File

@ -263,9 +263,9 @@ nfs_co_generic_cb(int ret, struct nfs_context *nfs, void *data,
nfs_co_generic_bh_cb, task); nfs_co_generic_bh_cb, task);
} }
static int coroutine_fn nfs_co_readv(BlockDriverState *bs, static int coroutine_fn nfs_co_preadv(BlockDriverState *bs, uint64_t offset,
int64_t sector_num, int nb_sectors, uint64_t bytes, QEMUIOVector *iov,
QEMUIOVector *iov) int flags)
{ {
NFSClient *client = bs->opaque; NFSClient *client = bs->opaque;
NFSRPC task; NFSRPC task;
@ -274,9 +274,7 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
task.iov = iov; task.iov = iov;
if (nfs_pread_async(client->context, client->fh, if (nfs_pread_async(client->context, client->fh,
sector_num * BDRV_SECTOR_SIZE, offset, bytes, nfs_co_generic_cb, &task) != 0) {
nb_sectors * BDRV_SECTOR_SIZE,
nfs_co_generic_cb, &task) != 0) {
return -ENOMEM; return -ENOMEM;
} }
@ -297,9 +295,9 @@ static int coroutine_fn nfs_co_readv(BlockDriverState *bs,
return 0; return 0;
} }
static int coroutine_fn nfs_co_writev(BlockDriverState *bs, static int coroutine_fn nfs_co_pwritev(BlockDriverState *bs, uint64_t offset,
int64_t sector_num, int nb_sectors, uint64_t bytes, QEMUIOVector *iov,
QEMUIOVector *iov) int flags)
{ {
NFSClient *client = bs->opaque; NFSClient *client = bs->opaque;
NFSRPC task; NFSRPC task;
@ -307,17 +305,16 @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
nfs_co_init_task(bs, &task); nfs_co_init_task(bs, &task);
buf = g_try_malloc(nb_sectors * BDRV_SECTOR_SIZE); buf = g_try_malloc(bytes);
if (nb_sectors && buf == NULL) { if (bytes && buf == NULL) {
return -ENOMEM; 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, if (nfs_pwrite_async(client->context, client->fh,
sector_num * BDRV_SECTOR_SIZE, offset, bytes, buf,
nb_sectors * BDRV_SECTOR_SIZE, nfs_co_generic_cb, &task) != 0) {
buf, nfs_co_generic_cb, &task) != 0) {
g_free(buf); g_free(buf);
return -ENOMEM; return -ENOMEM;
} }
@ -329,7 +326,7 @@ static int coroutine_fn nfs_co_writev(BlockDriverState *bs,
g_free(buf); g_free(buf);
if (task.ret != nb_sectors * BDRV_SECTOR_SIZE) { if (task.ret != bytes) {
return task.ret < 0 ? task.ret : -EIO; return task.ret < 0 ? task.ret : -EIO;
} }
@ -861,8 +858,8 @@ static BlockDriver bdrv_nfs = {
.bdrv_create = nfs_file_create, .bdrv_create = nfs_file_create,
.bdrv_reopen_prepare = nfs_reopen_prepare, .bdrv_reopen_prepare = nfs_reopen_prepare,
.bdrv_co_readv = nfs_co_readv, .bdrv_co_preadv = nfs_co_preadv,
.bdrv_co_writev = nfs_co_writev, .bdrv_co_pwritev = nfs_co_pwritev,
.bdrv_co_flush_to_disk = nfs_co_flush, .bdrv_co_flush_to_disk = nfs_co_flush,
.bdrv_detach_aio_context = nfs_detach_aio_context, .bdrv_detach_aio_context = nfs_detach_aio_context,