From: Venkateswararao Jujjuri (JV) <jv...@linux.vnet.ibm.com>
Rearrange the code so that we can avoid V9fsLcreateState
and additional malloc()s.
Signed-off-by: Venkateswararao Jujjuri "<jv...@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
---
hw/9pfs/virtio-9p.c | 63 ++++++++++++++++++++++++--------------------------
hw/9pfs/virtio-9p.h | 11 ---------
2 files changed, 30 insertions(+), 44 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 90636c3..3447b91 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1609,63 +1609,60 @@ out:
static void v9fs_lcreate(void *opaque)
{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
int32_t dfid, flags, mode;
gid_t gid;
- V9fsLcreateState *vs;
ssize_t err = 0;
+ ssize_t offset = 7;
+ V9fsString fullname;
+ V9fsString name;
+ V9fsFidState *fidp;
+ struct stat stbuf;
+ V9fsQID qid;
+ int32_t iounit;
+ V9fsPDU *pdu = opaque;
- 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, "dsddd", &dfid, &vs->name, &flags,
- &mode, &gid);
+ pdu_unmarshal(pdu, offset, "dsddd", &dfid, &name, &flags,
+ &mode, &gid);
- vs->fidp = lookup_fid(s, dfid);
- if (vs->fidp == NULL) {
+ fidp = lookup_fid(pdu->s, dfid);
+ if (fidp == NULL) {
err = -ENOENT;
goto out;
}
- v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->fidp->path.data,
- vs->name.data);
+ v9fs_string_sprintf(&fullname, "%s/%s", fidp->path.data, 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);
- if (vs->fidp->fs.fd == -1) {
+ fidp->fs.fd = v9fs_do_open2(pdu->s, fullname.data, fidp->uid,
+ gid, flags, mode);
+ if (fidp->fs.fd == -1) {
err = -errno;
goto out;
}
+ fidp->fid_type = P9_FID_FILE;
+ iounit = get_iounit(pdu->s, &fullname);
- vs->fidp->fid_type = P9_FID_FILE;
- vs->iounit = get_iounit(s, &vs->fullname);
-
- err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf);
+ err = v9fs_do_lstat(pdu->s, &fullname, &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;
+ v9fs_string_copy(&fidp->path, &fullname);
+ stat_to_qid(&stbuf, &qid);
+ offset += pdu_marshal(pdu, offset, "Qd", &qid, iounit);
+ err = offset;
} else {
- vs->fidp->fid_type = P9_FID_NONE; /*TODO:Why are we keeping this fid?*/
+ 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);
+ if (fidp->fs.fd > 0) {
+ close(fidp->fs.fd);
}
}
out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- v9fs_string_free(&vs->fullname);
- qemu_free(vs);
+ complete_pdu(pdu->s, pdu, err);
+ v9fs_string_free(&name);
+ v9fs_string_free(&fullname);
}
static void v9fs_post_do_fsync(V9fsState *s, V9fsPDU *pdu, int err)
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index edf3413..97ceb72 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -236,17 +236,6 @@ typedef struct V9fsCreateState {
int iounit;
} V9fsCreateState;
-typedef struct V9fsLcreateState {
- V9fsPDU *pdu;
- size_t offset;
- V9fsFidState *fidp;
- V9fsQID qid;
- int32_t iounit;
- struct stat stbuf;
- V9fsString name;
- V9fsString fullname;
-} V9fsLcreateState;
-
typedef struct V9fsStatState {
V9fsPDU *pdu;
size_t offset;
--
1.7.4.1
