Signed-off-by: Venkateswararao Jujjuri "<jv...@linux.vnet.ibm.com> --- hw/9pfs/cofs.c | 28 ++++++++++++++++++++++++++++ hw/9pfs/virtio-9p-coth.h | 1 + hw/9pfs/virtio-9p.c | 11 ++--------- 3 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index 06127f7..68cd3ab 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -269,3 +269,31 @@ int v9fs_co_mknod(V9fsState *s, V9fsString *path, uid_t uid, qemu_coroutine_yield(); return vs.err; } + +typedef struct V9fsThRemoveState { + V9fsState *s; + V9fsString *path; + int err; + V9fsRequest request; +} V9fsThRemoveState; + +static void v9fs_th_do_remove(V9fsRequest *request) +{ + V9fsThRemoveState *vsp = container_of(request, V9fsThRemoveState, request); + vsp->err = vsp->s->ops->remove(&vsp->s->ctx, vsp->path->data); + if (vsp->err < 0) { + vsp->err = -errno; + } +} + +int v9fs_co_remove(V9fsState *s, V9fsString *path) +{ + V9fsThRemoveState vs; + vs.s = s; + vs.path = path; + vs.request.func = v9fs_th_do_remove; + vs.request.coroutine = qemu_coroutine_self(); + v9fs_qemu_submit_request(&vs.request); + qemu_coroutine_yield(); + return vs.err; +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index 3edab4e..b6428ec 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -67,4 +67,5 @@ extern int v9fs_co_lgetxattr(V9fsState *, V9fsString *, extern int v9fs_co_mknod(V9fsState *, V9fsString *, uid_t, gid_t, dev_t, mode_t); extern int v9fs_co_mkdir(V9fsState *, char *, mode_t, uid_t, gid_t); +extern int v9fs_co_remove(V9fsState *, V9fsString *); #endif diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 114162c..479ad78 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -212,11 +212,6 @@ static int v9fs_do_utimensat(V9fsState *s, V9fsString *path, return s->ops->utimensat(&s->ctx, path->data, times); } -static int v9fs_do_remove(V9fsState *s, V9fsString *path) -{ - return s->ops->remove(&s->ctx, path->data); -} - static int v9fs_do_fsync(V9fsState *s, int fd, int datasync) { return s->ops->fsync(&s->ctx, fd, datasync); @@ -2627,10 +2622,8 @@ static void v9fs_remove(void *opaque) err = -EINVAL; goto out; } - err = v9fs_do_remove(copdu->s, &fidp->path); - if (err < 0) { - err = -errno; - } else { + err = v9fs_co_remove(copdu->s, &fidp->path); + if (!err) { err = offset; } -- 1.7.1