[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -V4 07/28] [virtio-9p] Remove post functions for v9f
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH -V4 07/28] [virtio-9p] Remove post functions for v9fs_lcreate |
Date: |
Mon, 8 Aug 2011 22:36:34 +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 | 79 +++++++++++++++-----------------------------------
1 files changed, 24 insertions(+), 55 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index c10ee0a..90636c3 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1607,57 +1607,6 @@ out:
complete_pdu(s, pdu, err);
}
-static void v9fs_post_lcreate(V9fsState *s, V9fsLcreateState *vs, int err)
-{
- if (err == 0) {
- v9fs_string_copy(&vs->fidp->path, &vs->fullname);
- stat_to_qid(&vs->stbuf, &vs->qid);
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid,
- vs->iounit);
- err = vs->offset;
- } else {
- vs->fidp->fid_type = P9_FID_NONE;
- err = -errno;
- if (vs->fidp->fs.fd > 0) {
- close(vs->fidp->fs.fd);
- }
- }
-
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- v9fs_string_free(&vs->fullname);
- qemu_free(vs);
-}
-
-static void v9fs_lcreate_post_get_iounit(V9fsState *s, V9fsLcreateState *vs,
- int err)
-{
- if (err) {
- err = -errno;
- goto out;
- }
- err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf);
-
-out:
- v9fs_post_lcreate(s, vs, err);
-}
-
-static void v9fs_lcreate_post_do_open2(V9fsState *s, V9fsLcreateState *vs,
- int err)
-{
- if (vs->fidp->fs.fd == -1) {
- err = -errno;
- goto out;
- }
- vs->fidp->fid_type = P9_FID_FILE;
- vs->iounit = get_iounit(s, &vs->fullname);
- v9fs_lcreate_post_get_iounit(s, vs, err);
- return;
-
-out:
- v9fs_post_lcreate(s, vs, err);
-}
-
static void v9fs_lcreate(void *opaque)
{
V9fsPDU *pdu = opaque;
@@ -1683,19 +1632,39 @@ static void v9fs_lcreate(void *opaque)
}
v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->fidp->path.data,
- vs->name.data);
+ vs->name.data);
/* Ignore direct disk access hint until the server supports it. */
flags &= ~O_DIRECT;
vs->fidp->fs.fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid,
- gid, flags, mode);
- v9fs_lcreate_post_do_open2(s, vs, err);
- return;
+ gid, flags, mode);
+ if (vs->fidp->fs.fd == -1) {
+ err = -errno;
+ goto out;
+ }
+ vs->fidp->fid_type = P9_FID_FILE;
+ vs->iounit = get_iounit(s, &vs->fullname);
+
+ err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf);
+ if (err == 0) {
+ v9fs_string_copy(&vs->fidp->path, &vs->fullname);
+ stat_to_qid(&vs->stbuf, &vs->qid);
+ vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid,
+ vs->iounit);
+ err = vs->offset;
+ } else {
+ vs->fidp->fid_type = P9_FID_NONE; /*TODO:Why are we keeping this fid?*/
+ err = -errno;
+ if (vs->fidp->fs.fd > 0) {
+ close(vs->fidp->fs.fd);
+ }
+ }
out:
complete_pdu(s, vs->pdu, err);
v9fs_string_free(&vs->name);
+ 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 <=
- [Qemu-devel] [PATCH -V4 18/28] [virtio-9p] Remove post functions for v9fs_symlink, Aneesh Kumar K.V, 2011/08/08
- [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