[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 10/29] [PATCH] [virtio-9p] coroutine and threading f
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [PATCH 10/29] [PATCH] [virtio-9p] coroutine and threading for open2 |
Date: |
Wed, 25 May 2011 16:52:58 -0700 |
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
---
hw/9pfs/cofile.c | 21 +++++++++++++++++++++
hw/9pfs/virtio-9p-coth.h | 1 +
hw/9pfs/virtio-9p.c | 45 +++++++++++++--------------------------------
3 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/hw/9pfs/cofile.c b/hw/9pfs/cofile.c
index 4a3ca21..4b0d96c 100644
--- a/hw/9pfs/cofile.c
+++ b/hw/9pfs/cofile.c
@@ -60,3 +60,24 @@ int v9fs_co_open(V9fsState *s, V9fsFidState *fidp, int flags)
});
return err;
}
+
+int v9fs_co_open2(V9fsState *s, V9fsFidState *fidp, char *fullname, gid_t gid,
+ int flags, int mode)
+{
+ int err;
+ FsCred cred;
+
+ cred_init(&cred);
+ cred.fc_mode = mode & 07777;
+ cred.fc_uid = fidp->uid;
+ cred.fc_gid = gid;
+ v9fs_co_run_in_worker(
+ {
+ fidp->fs.fd = s->ops->open2(&s->ctx, fullname, flags, &cred);
+ err = 0;
+ if (fidp->fs.fd == -1) {
+ err = -errno;
+ }
+ });
+ return err;
+}
diff --git a/hw/9pfs/virtio-9p-coth.h b/hw/9pfs/virtio-9p-coth.h
index 1df7063..f9610b9 100644
--- a/hw/9pfs/virtio-9p-coth.h
+++ b/hw/9pfs/virtio-9p-coth.h
@@ -79,4 +79,5 @@ extern int v9fs_co_rename(V9fsState *, V9fsString *,
V9fsString *);
extern int v9fs_co_fstat(V9fsState *, int, struct stat *);
extern int v9fs_co_opendir(V9fsState *, V9fsFidState *);
extern int v9fs_co_open(V9fsState *, V9fsFidState *, int);
+extern int v9fs_co_open2(V9fsState *, V9fsFidState *, char *, gid_t, int, int);
#endif
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 49de67c..f535134 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -149,20 +149,6 @@ static int v9fs_do_fstat(V9fsState *s, int fd, struct stat
*stbuf)
return s->ops->fstat(&s->ctx, fd, stbuf);
}
-static int v9fs_do_open2(V9fsState *s, char *fullname, uid_t uid, gid_t gid,
- int flags, int mode)
-{
- FsCred cred;
-
- cred_init(&cred);
- cred.fc_uid = uid;
- cred.fc_gid = gid;
- cred.fc_mode = mode & 07777;
- flags = flags;
-
- return s->ops->open2(&s->ctx, fullname, flags, &cred);
-}
-
static int v9fs_do_symlink(V9fsState *s, V9fsFidState *fidp,
const char *oldpath, const char *newpath, gid_t gid)
{
@@ -1632,34 +1618,30 @@ static void v9fs_lcreate(void *opaque)
err = -ENOENT;
goto out;
}
-
v9fs_string_sprintf(&fullname, "%s/%s", fidp->path.data, name.data);
/* Ignore direct disk access hint until the server supports it. */
flags &= ~O_DIRECT;
- fidp->fs.fd = v9fs_do_open2(pdu->s, fullname.data, fidp->uid,
- gid, flags, mode);
- if (fidp->fs.fd == -1) {
- err = -errno;
+ err = v9fs_co_open2(pdu->s, fidp, fullname.data, gid, flags, mode);
+ if (err < 0) {
goto out;
}
fidp->fid_type = P9_FID_FILE;
iounit = get_iounit(pdu->s, &fullname);
- err = v9fs_do_lstat(pdu->s, &fullname, &stbuf);
- if (err == 0) {
- v9fs_string_copy(&fidp->path, &fullname);
- stat_to_qid(&stbuf, &qid);
- offset += pdu_marshal(pdu, offset, "Qd", &qid, iounit);
- err = offset;
- } else {
- fidp->fid_type = P9_FID_NONE; /*TODO:Why are we keeping this fid?*/
- err = -errno;
+ err = v9fs_co_lstat(pdu->s, &fullname, &stbuf);
+ if (err < 0) {
+ fidp->fid_type = P9_FID_NONE;
if (fidp->fs.fd > 0) {
close(fidp->fs.fd);
}
+ goto out;
}
+ v9fs_string_copy(&fidp->path, &fullname);
+ stat_to_qid(&stbuf, &qid);
+ offset += pdu_marshal(pdu, offset, "Qd", &qid, iounit);
+ err = offset;
out:
complete_pdu(pdu->s, pdu, err);
v9fs_string_free(&name);
@@ -2240,8 +2222,7 @@ static void v9fs_create_post_fstat(V9fsState *s,
V9fsCreateState *vs, int err)
static void v9fs_create_post_open2(V9fsState *s, V9fsCreateState *vs, int err)
{
- if (vs->fidp->fs.fd == -1) {
- err = -errno;
+ if (err < 0) {
goto out;
}
vs->fidp->fid_type = P9_FID_FILE;
@@ -2316,8 +2297,8 @@ static void v9fs_create_post_lstat(V9fsState *s,
V9fsCreateState *vs, int err)
0, vs->fidp->uid, -1);
v9fs_post_create(s, vs, err);
} else {
- vs->fidp->fs.fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid,
- -1, omode_to_uflags(vs->mode)|O_CREAT, vs->perm);
+ err = v9fs_co_open2(s, vs->fidp, vs->fullname.data, -1,
+ omode_to_uflags(vs->mode)|O_CREAT, vs->perm);
v9fs_create_post_open2(s, vs, err);
}
--
1.7.1
- [Qemu-devel] [PATCH 06/29] hw/9pfs: Add yield support for open and opendir coroutine, (continued)
- [Qemu-devel] [PATCH 06/29] hw/9pfs: Add yield support for open and opendir coroutine, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 03/29] hw/9pfs: Add yeild support for fstat coroutine, Venkateswararao Jujjuri (JV), 2011/05/25
- [Qemu-devel] [PATCH 01/29] hw/9pfs: Add yeild support to rename coroutine, Venkateswararao Jujjuri (JV), 2011/05/25
- [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) <=
- [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), 2011/05/25
- [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