[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 20/29] [virtio-9p] clean up v9fs_symlink
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [PATCH 20/29] [virtio-9p] clean up v9fs_symlink |
Date: |
Wed, 25 May 2011 16:53:08 -0700 |
Rearrange the code so that we can avoid V9fsSymlinkState
and additional malloc()s.
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
---
hw/9pfs/virtio-9p.c | 45 +++++++++++++++++++++------------------------
hw/9pfs/virtio-9p.h | 12 ------------
2 files changed, 21 insertions(+), 36 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 8702319..1e6c2b8 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -2120,49 +2120,46 @@ out:
static void v9fs_symlink(void *opaque)
{
V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
+ V9fsString name;
+ V9fsString symname;
+ V9fsString fullname;
+ V9fsFidState *dfidp;
+ V9fsQID qid;
+ struct stat stbuf;
int32_t dfid;
- V9fsSymlinkState *vs;
int err = 0;
gid_t gid;
+ size_t offset = 7;
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- v9fs_string_init(&vs->fullname);
+ v9fs_string_init(&fullname);
- pdu_unmarshal(vs->pdu, vs->offset, "dssd", &dfid, &vs->name,
- &vs->symname, &gid);
+ pdu_unmarshal(pdu, offset, "dssd", &dfid, &name, &symname, &gid);
- vs->dfidp = lookup_fid(s, dfid);
- if (vs->dfidp == NULL) {
+ dfidp = lookup_fid(pdu->s, dfid);
+ if (dfidp == NULL) {
err = -EINVAL;
goto out;
}
- v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->dfidp->path.data,
- vs->name.data);
- err = v9fs_do_symlink(s, vs->dfidp, vs->symname.data,
- vs->fullname.data, gid);
+ v9fs_string_sprintf(&fullname, "%s/%s", dfidp->path.data, name.data);
+ err = v9fs_do_symlink(pdu->s, dfidp, symname.data, fullname.data, gid);
if (err < 0) {
err = -errno;
goto out;
}
- err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf);
+ err = v9fs_do_lstat(pdu->s, &fullname, &stbuf);
if (err == 0) {
- stat_to_qid(&vs->stbuf, &vs->qid);
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "Q", &vs->qid);
- err = vs->offset;
+ stat_to_qid(&stbuf, &qid);
+ offset += pdu_marshal(pdu, offset, "Q", &qid);
+ err = offset;
} else {
err = -errno;
}
out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- v9fs_string_free(&vs->symname);
- v9fs_string_free(&vs->fullname);
- qemu_free(vs);
+ complete_pdu(pdu->s, pdu, err);
+ v9fs_string_free(&name);
+ v9fs_string_free(&symname);
+ v9fs_string_free(&fullname);
}
static void v9fs_flush(void *opaque)
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index e7d87d9..29f3184 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -305,18 +305,6 @@ typedef struct V9fsWstatState
struct stat stbuf;
} V9fsWstatState;
-typedef struct V9fsSymlinkState
-{
- V9fsPDU *pdu;
- size_t offset;
- V9fsString name;
- V9fsString symname;
- V9fsString fullname;
- V9fsFidState *dfidp;
- V9fsQID qid;
- struct stat stbuf;
-} V9fsSymlinkState;
-
typedef struct V9fsIattr
{
int32_t valid;
--
1.7.1
- [Qemu-devel] [PATCH 04/29] hw/9pfs: Update v9fs_lock to use coroutines, (continued)
- [Qemu-devel] [PATCH 04/29] hw/9pfs: Update v9fs_lock to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 09/29] [virtio-9p] clean up v9fs_lcreate, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 05/29] hw/9pfs: Update v9fs_getlock to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 14/29] hw/9pfs: Update v9fs_clunk to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 07/29] hw/9pfs: Update v9fs_open to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 16/29] hw/9pfs: Update v9fs_fsync to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 22/29] [virtio-9p] coroutine and threading for v9fs_do_link, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 10/29] [PATCH] [virtio-9p] coroutine and threading for open2, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 12/29] hw/9pfs: Update v9fs_walk to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 17/29] [virtio-9p] Remove post functions for v9fs_create, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 20/29] [virtio-9p] clean up v9fs_symlink,
Venkateswararao Jujjuri (JV) <=
- [Qemu-devel] [PATCH 19/29] [virtio-9p] Remove post functions for v9fs_symlink, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 18/29] [virtio-9p] clean up v9fs_create Rearrange the code, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 27/29] hw/9pfs: Add yield support for preadv coroutine, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 11/29] hw/9pfs: Update v9fs_stat to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 08/29] [virtio-9p] Remove post functions for v9fs_lcreate, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 23/29] hw/9pfs: Add yield support for pwritev coroutine, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 21/29] [virtio-9p] coroutine and threading for v9fs_do_symlink, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 13/29] hw/9pfs: Add yeild support for clunk related coroutine, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 29/29] use readdir_r instead of readdir for reentrancy, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 26/29] hw/9pfs: Update v9fs_attach to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/25