[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [V3 23/24] [virtio-9p] clean up v9fs_remove.
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [V3 23/24] [virtio-9p] clean up v9fs_remove. |
Date: |
Wed, 18 May 2011 19:57:13 -0700 |
Rearrange the code so that we can avoid V9fsRemoveState
and additional malloc()s.
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
---
hw/9pfs/virtio-9p.c | 25 ++++++++++---------------
hw/9pfs/virtio-9p.h | 6 ------
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 1e860c6..7327b3b 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -2582,35 +2582,30 @@ out:
static void v9fs_remove(void *opaque)
{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
int32_t fid;
- V9fsRemoveState *vs;
int err = 0;
+ size_t offset = 7;
+ V9fsFidState *fidp;
+ V9fsPDU *pdu = opaque;
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- pdu_unmarshal(vs->pdu, vs->offset, "d", &fid);
+ pdu_unmarshal(pdu, offset, "d", &fid);
- vs->fidp = lookup_fid(s, fid);
- if (vs->fidp == NULL) {
+ fidp = lookup_fid(pdu->s, fid);
+ if (fidp == NULL) {
err = -EINVAL;
goto out;
}
- err = v9fs_do_remove(s, &vs->fidp->path);
+ err = v9fs_do_remove(pdu->s, &fidp->path);
if (err < 0) {
err = -errno;
} else {
- err = vs->offset;
+ err = offset;
}
/* For TREMOVE we need to clunk the fid even on failed remove */
- free_fid(s, vs->fidp->fid);
+ free_fid(pdu->s, fidp->fid);
out:
- complete_pdu(s, pdu, err);
- qemu_free(vs);
+ complete_pdu(pdu->s, pdu, err);
}
static void v9fs_wstat_post_truncate(V9fsState *s, V9fsWstatState *vs, int err)
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index d57d5ae..837ce67 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -333,12 +333,6 @@ typedef struct V9fsWriteState {
int cnt;
} V9fsWriteState;
-typedef struct V9fsRemoveState {
- V9fsPDU *pdu;
- size_t offset;
- V9fsFidState *fidp;
-} V9fsRemoveState;
-
typedef struct V9fsWstatState
{
V9fsPDU *pdu;
--
1.7.1
- [Qemu-devel] [V3 13/24] hw/9pfs: Update v9fs_getattr to use coroutines, (continued)
- [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), 2011/05/18
- [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) <=