Signed-off-by: Venkateswararao Jujjuri "<jv...@linux.vnet.ibm.com>
---
hw/9pfs/virtio-9p.c | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index e5112fe..dcce864 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -2612,22 +2612,6 @@ out:
qemu_free(copdu);
}
-static void v9fs_remove_post_remove(V9fsState *s, V9fsRemoveState *vs,
- int err)
-{
- if (err < 0) {
- err = -errno;
- } else {
- err = vs->offset;
- }
-
- /* For TREMOVE we need to clunk the fid even on failed remove */
- free_fid(s, vs->fidp->fid);
-
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
-}
-
static void v9fs_remove(void *opaque)
{
V9fsCoPdu *copdu = opaque;
@@ -2648,11 +2632,15 @@ static void v9fs_remove(void *opaque)
err = -EINVAL;
goto out;
}
-
err = v9fs_do_remove(s, &vs->fidp->path);
- v9fs_remove_post_remove(s, vs, err);
- return;
+ if (err < 0) {
+ err = -errno;
+ } else {
+ err = vs->offset;
+ }
+ /* For TREMOVE we need to clunk the fid even on failed remove */
+ free_fid(s, vs->fidp->fid);
out:
complete_pdu(s, pdu, err);
qemu_free(vs);
--
1.7.1
