[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -V4 18/28] [virtio-9p] Remove post functions for v9f
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH -V4 18/28] [virtio-9p] Remove post functions for v9fs_symlink |
Date: |
Mon, 8 Aug 2011 22:36:45 +0530 |
From: Venkateswararao Jujjuri (JV) <address@hidden>
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/9pfs/virtio-9p.c | 47 +++++++++++++++--------------------------------
1 files changed, 15 insertions(+), 32 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 68b18d6..35de63a 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -2119,33 +2119,6 @@ out:
v9fs_string_free(&fullname);
}
-static void v9fs_post_symlink(V9fsState *s, V9fsSymlinkState *vs, int err)
-{
- if (err == 0) {
- stat_to_qid(&vs->stbuf, &vs->qid);
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "Q", &vs->qid);
- err = vs->offset;
- } else {
- err = -errno;
- }
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- v9fs_string_free(&vs->symname);
- v9fs_string_free(&vs->fullname);
- qemu_free(vs);
-}
-
-static void v9fs_symlink_post_do_symlink(V9fsState *s, V9fsSymlinkState *vs,
- int err)
-{
- if (err) {
- goto out;
- }
- err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf);
-out:
- v9fs_post_symlink(s, vs, err);
-}
-
static void v9fs_symlink(void *opaque)
{
V9fsPDU *pdu = opaque;
@@ -2171,16 +2144,26 @@ static void v9fs_symlink(void *opaque)
}
v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->dfidp->path.data,
- vs->name.data);
+ vs->name.data);
err = v9fs_do_symlink(s, vs->dfidp, vs->symname.data,
- vs->fullname.data, gid);
- v9fs_symlink_post_do_symlink(s, vs, err);
- return;
-
+ vs->fullname.data, gid);
+ if (err < 0) {
+ err = -errno;
+ goto out;
+ }
+ err = v9fs_do_lstat(s, &vs->fullname, &vs->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;
+ } 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);
}
--
1.7.4.1
- [Qemu-devel] [PATCHSET 2] VirtFS coroutine changes, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 07/28] [virtio-9p] Remove post functions for v9fs_lcreate, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 18/28] [virtio-9p] Remove post functions for v9fs_symlink,
Aneesh Kumar K.V <=
- [Qemu-devel] [PATCH -V4 26/28] hw/9pfs: Add yield support for preadv coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 27/28] hw/9pfs: Update v9fs_read to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 09/28] [virtio-9p] coroutine and threading for open2, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 11/28] hw/9pfs: Update v9fs_walk to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 10/28] hw/9pfs: Update v9fs_stat to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 02/28] hw/9pfs: Add yeild support for fstat coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 06/28] hw/9pfs: Update v9fs_open to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 25/28] hw/9pfs: Update v9fs_attach to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 15/28] hw/9pfs: Update v9fs_fsync to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 19/28] [virtio-9p] clean up v9fs_symlink, Aneesh Kumar K.V, 2011/08/08