From: Venkateswararao Jujjuri (JV) <jv...@linux.vnet.ibm.com> Signed-off-by: Venkateswararao Jujjuri "<jv...@linux.vnet.ibm.com> Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com> --- hw/9pfs/cofs.c | 14 ++++++++++++++ hw/9pfs/virtio-9p-coth.h | 1 + hw/9pfs/virtio-9p.c | 11 ++--------- 3 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/hw/9pfs/cofs.c b/hw/9pfs/cofs.c index 6fcedd8..8fbfe73 100644 --- a/hw/9pfs/cofs.c +++ b/hw/9pfs/cofs.c @@ -141,3 +141,17 @@ int v9fs_co_mknod(V9fsState *s, V9fsString *path, uid_t uid, }); return err; } + +int v9fs_co_remove(V9fsState *s, V9fsString *path) +{ + int err; + + v9fs_co_run_in_worker( + { + err = s->ops->remove(&s->ctx, path->data); + if (err < 0) { + err = -errno; + } + }); + return err; +} diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h index 96e88d8..60795c4 100644 --- a/hw/9pfs/virtio-9p-coth.h +++ b/hw/9pfs/virtio-9p-coth.h @@ -74,4 +74,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 f572053..86d4dec 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -211,11 +211,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); @@ -2594,10 +2589,8 @@ static void v9fs_remove(void *opaque) err = -EINVAL; goto out; } - err = v9fs_do_remove(pdu->s, &fidp->path); - if (err < 0) { - err = -errno; - } else { + err = v9fs_co_remove(pdu->s, &fidp->path); + if (!err) { err = offset; } -- 1.7.4.1