[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [V3 22/24] [virtio-9p] Remove post functions for v9fs_remov
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [V3 22/24] [virtio-9p] Remove post functions for v9fs_remove |
Date: |
Wed, 18 May 2011 19:57:12 -0700 |
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
---
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 8dd6f7d..1e860c6 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -2580,22 +2580,6 @@ out:
complete_pdu(s, pdu, err);
}
-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)
{
V9fsPDU *pdu = opaque;
@@ -2615,11 +2599,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
- [Qemu-devel] [V3 15/24] hw/9pfs: Update v9fs_setattr to use coroutines, (continued)
- [Qemu-devel] [V3 15/24] hw/9pfs: Update v9fs_setattr to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 14/24] hw/9pfs: Add yield support to setattr related coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 13/24] hw/9pfs: Update v9fs_getattr to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 01/24] [virtio-9p] Add infrastructure to support glib threads and coroutines., Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 17/24] hw/9pfs: Update v9fs_xattrwalk to coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 18/24] hw/9pfs: Update v9fs_xattrcreate to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 16/24] hw/9pfs: Add yield support to xattr related coroutine, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 20/24] hw/9pfs: Update v9fs_mknod to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 19/24] hw/9pfs: Add yield support to mknod coroutine, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 21/24] [virtio-9p] coroutine and threading for mkdir, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 22/24] [virtio-9p] Remove post functions for v9fs_remove,
Venkateswararao Jujjuri (JV) <=
- [Qemu-devel] [V3 24/24] [virtio-9p] coroutine and threading for remove/unlink, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 23/24] [virtio-9p] clean up v9fs_remove., Venkateswararao Jujjuri (JV), 2011/05/18