From: "Venkateswararao Jujjuri (JV)" <jvrao@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@us.ibm.com,
"Venkateswararao Jujjuri \"" <jvrao@linux.vnet.ibm.com>,
stefanha@linux.vnet.ibm.com,
"Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Subject: [Qemu-devel] [V3 17/24] hw/9pfs: Update v9fs_xattrwalk to coroutines
Date: Wed, 18 May 2011 19:57:07 -0700 [thread overview]
Message-ID: <1305773834-16359-18-git-send-email-jvrao@linux.vnet.ibm.com> (raw)
In-Reply-To: <1305773834-16359-1-git-send-email-jvrao@linux.vnet.ibm.com>
From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri "<jvrao@linux.vnet.ibm.com>
---
hw/9pfs/virtio-9p.c | 198 ++++++++++++++++-----------------------------------
1 files changed, 63 insertions(+), 135 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 0f965b5..5336b8b 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -240,21 +240,6 @@ static int v9fs_do_statfs(V9fsState *s, V9fsString *path, struct statfs *stbuf)
return s->ops->statfs(&s->ctx, path->data, stbuf);
}
-static ssize_t v9fs_do_lgetxattr(V9fsState *s, V9fsString *path,
- V9fsString *xattr_name,
- void *value, size_t size)
-{
- return s->ops->lgetxattr(&s->ctx, path->data,
- xattr_name->data, value, size);
-}
-
-static ssize_t v9fs_do_llistxattr(V9fsState *s, V9fsString *path,
- void *value, size_t size)
-{
- return s->ops->llistxattr(&s->ctx, path->data,
- value, size);
-}
-
static int v9fs_do_lsetxattr(V9fsState *s, V9fsString *path,
V9fsString *xattr_name,
void *value, size_t size, int flags)
@@ -3242,149 +3227,92 @@ out:
v9fs_string_free(&name);
}
-static void v9fs_post_xattr_getvalue(V9fsState *s, V9fsXattrState *vs, int err)
-{
-
- if (err < 0) {
- err = -errno;
- free_fid(s, vs->xattr_fidp->fid);
- goto out;
- }
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "q", vs->size);
- err = vs->offset;
-out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
- return;
-}
-
-static void v9fs_post_xattr_check(V9fsState *s, V9fsXattrState *vs, ssize_t err)
-{
- if (err < 0) {
- err = -errno;
- free_fid(s, vs->xattr_fidp->fid);
- goto out;
- }
- /*
- * Read the xattr value
- */
- vs->xattr_fidp->fs.xattr.len = vs->size;
- vs->xattr_fidp->fid_type = P9_FID_XATTR;
- vs->xattr_fidp->fs.xattr.copied_len = -1;
- if (vs->size) {
- vs->xattr_fidp->fs.xattr.value = qemu_malloc(vs->size);
- err = v9fs_do_lgetxattr(s, &vs->xattr_fidp->path,
- &vs->name, vs->xattr_fidp->fs.xattr.value,
- vs->xattr_fidp->fs.xattr.len);
- }
- v9fs_post_xattr_getvalue(s, vs, err);
- return;
-out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
-}
-
-static void v9fs_post_lxattr_getvalue(V9fsState *s,
- V9fsXattrState *vs, int err)
-{
- if (err < 0) {
- err = -errno;
- free_fid(s, vs->xattr_fidp->fid);
- goto out;
- }
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "q", vs->size);
- err = vs->offset;
-out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
- return;
-}
-
-static void v9fs_post_lxattr_check(V9fsState *s,
- V9fsXattrState *vs, ssize_t err)
-{
- if (err < 0) {
- err = -errno;
- free_fid(s, vs->xattr_fidp->fid);
- goto out;
- }
- /*
- * Read the xattr value
- */
- vs->xattr_fidp->fs.xattr.len = vs->size;
- vs->xattr_fidp->fid_type = P9_FID_XATTR;
- vs->xattr_fidp->fs.xattr.copied_len = -1;
- if (vs->size) {
- vs->xattr_fidp->fs.xattr.value = qemu_malloc(vs->size);
- err = v9fs_do_llistxattr(s, &vs->xattr_fidp->path,
- vs->xattr_fidp->fs.xattr.value,
- vs->xattr_fidp->fs.xattr.len);
- }
- v9fs_post_lxattr_getvalue(s, vs, err);
- return;
-out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
-}
-
static void v9fs_xattrwalk(void *opaque)
{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
+ int64_t size;
+ V9fsString name;
ssize_t err = 0;
- V9fsXattrState *vs;
+ size_t offset = 7;
int32_t fid, newfid;
+ V9fsFidState *file_fidp;
+ V9fsFidState *xattr_fidp;
+ V9fsPDU *pdu = opaque;
+ V9fsState *s = pdu->s;
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- pdu_unmarshal(vs->pdu, vs->offset, "dds", &fid, &newfid, &vs->name);
- vs->file_fidp = lookup_fid(s, fid);
- if (vs->file_fidp == NULL) {
+ pdu_unmarshal(pdu, offset, "dds", &fid, &newfid, &name);
+ file_fidp = lookup_fid(s, fid);
+ if (file_fidp == NULL) {
err = -ENOENT;
goto out;
}
-
- vs->xattr_fidp = alloc_fid(s, newfid);
- if (vs->xattr_fidp == NULL) {
+ xattr_fidp = alloc_fid(s, newfid);
+ if (xattr_fidp == NULL) {
err = -EINVAL;
goto out;
}
-
- v9fs_string_copy(&vs->xattr_fidp->path, &vs->file_fidp->path);
- if (vs->name.data[0] == 0) {
+ v9fs_string_copy(&xattr_fidp->path, &file_fidp->path);
+ if (name.data[0] == 0) {
/*
* listxattr request. Get the size first
*/
- vs->size = v9fs_do_llistxattr(s, &vs->xattr_fidp->path,
- NULL, 0);
- if (vs->size < 0) {
- err = vs->size;
+ size = v9fs_co_llistxattr(s, &xattr_fidp->path, NULL, 0);
+ if (size < 0) {
+ err = size;
+ free_fid(s, xattr_fidp->fid);
+ goto out;
}
- v9fs_post_lxattr_check(s, vs, err);
- return;
+ /*
+ * Read the xattr value
+ */
+ xattr_fidp->fs.xattr.len = size;
+ xattr_fidp->fid_type = P9_FID_XATTR;
+ xattr_fidp->fs.xattr.copied_len = -1;
+ if (size) {
+ xattr_fidp->fs.xattr.value = qemu_malloc(size);
+ err = v9fs_co_llistxattr(s, &xattr_fidp->path,
+ xattr_fidp->fs.xattr.value,
+ xattr_fidp->fs.xattr.len);
+ if (err < 0) {
+ free_fid(s, xattr_fidp->fid);
+ goto out;
+ }
+ }
+ offset += pdu_marshal(pdu, offset, "q", size);
+ err = offset;
} else {
/*
* specific xattr fid. We check for xattr
* presence also collect the xattr size
*/
- vs->size = v9fs_do_lgetxattr(s, &vs->xattr_fidp->path,
- &vs->name, NULL, 0);
- if (vs->size < 0) {
- err = vs->size;
+ size = v9fs_co_lgetxattr(s, &xattr_fidp->path,
+ &name, NULL, 0);
+ if (size < 0) {
+ err = size;
+ free_fid(s, xattr_fidp->fid);
+ goto out;
}
- v9fs_post_xattr_check(s, vs, err);
- return;
+ /*
+ * Read the xattr value
+ */
+ xattr_fidp->fs.xattr.len = size;
+ xattr_fidp->fid_type = P9_FID_XATTR;
+ xattr_fidp->fs.xattr.copied_len = -1;
+ if (size) {
+ xattr_fidp->fs.xattr.value = qemu_malloc(size);
+ err = v9fs_co_lgetxattr(s, &xattr_fidp->path,
+ &name, xattr_fidp->fs.xattr.value,
+ xattr_fidp->fs.xattr.len);
+ if (err < 0) {
+ free_fid(s, xattr_fidp->fid);
+ goto out;
+ }
+ }
+ offset += pdu_marshal(pdu, offset, "q", size);
+ err = offset;
}
out:
- complete_pdu(s, vs->pdu, err);
- v9fs_string_free(&vs->name);
- qemu_free(vs);
+ complete_pdu(s, pdu, err);
+ v9fs_string_free(&name);
}
static void v9fs_xattrcreate(void *opaque)
--
1.7.1
next prev parent reply other threads:[~2011-05-19 2:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-19 2:56 [Qemu-devel] [V3 0/24] Async threading for VirtFS using glib threads & coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 01/24] [virtio-9p] Add infrastructure to support glib threads and coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 02/24] [virtio-9p] Change all pdu handlers to coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 03/24] [virtio-9p] Remove post functions for v9fs_readlink Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 04/24] [virtio-9p] clean up v9fs_readlink Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 05/24] [virtio-9p] coroutines for readlink Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 06/24] [virtio-9p] Remove post functions for v9fs_mkdir Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 07/24] [virtio-9p] clean up v9fs_mkdir Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 08/24] hw/9pfs: Add yield support for readdir related coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:56 ` [Qemu-devel] [V3 09/24] hw/9pfs: Update v9fs_readdir to use coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 10/24] hw/9pfs: Add yield support to statfs coroutine Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 11/24] hw/9pfs: Update v9fs_statfs to use coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 12/24] hw/9pfs: Add yield support to lstat coroutine Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 13/24] hw/9pfs: Update v9fs_getattr to use coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 14/24] hw/9pfs: Add yield support to setattr related coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 15/24] hw/9pfs: Update v9fs_setattr to use coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 16/24] hw/9pfs: Add yield support to xattr related coroutine Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` Venkateswararao Jujjuri (JV) [this message]
2011-05-19 2:57 ` [Qemu-devel] [V3 18/24] hw/9pfs: Update v9fs_xattrcreate to use coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 19/24] hw/9pfs: Add yield support to mknod coroutine Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 20/24] hw/9pfs: Update v9fs_mknod to use coroutines Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 21/24] [virtio-9p] coroutine and threading for mkdir Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 22/24] [virtio-9p] Remove post functions for v9fs_remove Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 23/24] [virtio-9p] clean up v9fs_remove Venkateswararao Jujjuri (JV)
2011-05-19 2:57 ` [Qemu-devel] [V3 24/24] [virtio-9p] coroutine and threading for remove/unlink Venkateswararao Jujjuri (JV)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305773834-16359-18-git-send-email-jvrao@linux.vnet.ibm.com \
--to=jvrao@linux.vnet.ibm.com \
--cc=aliguori@us.ibm.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).