[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [V3 15/24] hw/9pfs: Update v9fs_setattr to use coroutines
From: |
Venkateswararao Jujjuri (JV) |
Subject: |
[Qemu-devel] [V3 15/24] hw/9pfs: Update v9fs_setattr to use coroutines |
Date: |
Wed, 18 May 2011 19:57:05 -0700 |
From: Aneesh Kumar K.V <address@hidden>
Signed-off-by: Aneesh Kumar K.V <address@hidden>
Signed-off-by: Venkateswararao Jujjuri "<address@hidden>
---
hw/9pfs/virtio-9p.c | 163 +++++++++++++++++----------------------------------
hw/9pfs/virtio-9p.h | 8 ---
2 files changed, 54 insertions(+), 117 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 4e9d73a..0f965b5 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -1330,139 +1330,84 @@ out:
#define ATTR_ATIME_SET (1 << 7)
#define ATTR_MTIME_SET (1 << 8)
-static void v9fs_setattr_post_truncate(V9fsState *s, V9fsSetattrState *vs,
- int err)
-{
- if (err == -1) {
- err = -errno;
- goto out;
- }
- err = vs->offset;
-
-out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
-}
-
-static void v9fs_setattr_post_chown(V9fsState *s, V9fsSetattrState *vs, int
err)
+static void v9fs_setattr(void *opaque)
{
- if (err == -1) {
- err = -errno;
- goto out;
- }
+ int err = 0;
+ int32_t fid;
+ V9fsFidState *fidp;
+ size_t offset = 7;
+ V9fsIattr v9iattr;
+ V9fsPDU *pdu = opaque;
+ V9fsState *s = pdu->s;
- if (vs->v9iattr.valid & (ATTR_SIZE)) {
- err = v9fs_do_truncate(s, &vs->fidp->path, vs->v9iattr.size);
- }
- v9fs_setattr_post_truncate(s, vs, err);
- return;
+ pdu_unmarshal(pdu, offset, "dI", &fid, &v9iattr);
-out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
-}
-
-static void v9fs_setattr_post_utimensat(V9fsState *s, V9fsSetattrState *vs,
- int err)
-{
- if (err == -1) {
- err = -errno;
+ fidp = lookup_fid(s, fid);
+ if (fidp == NULL) {
+ err = -EINVAL;
goto out;
}
-
- /* If the only valid entry in iattr is ctime we can call
- * chown(-1,-1) to update the ctime of the file
- */
- if ((vs->v9iattr.valid & (ATTR_UID | ATTR_GID)) ||
- ((vs->v9iattr.valid & ATTR_CTIME)
- && !((vs->v9iattr.valid & ATTR_MASK) & ~ATTR_CTIME))) {
- if (!(vs->v9iattr.valid & ATTR_UID)) {
- vs->v9iattr.uid = -1;
- }
- if (!(vs->v9iattr.valid & ATTR_GID)) {
- vs->v9iattr.gid = -1;
+ if (v9iattr.valid & ATTR_MODE) {
+ err = v9fs_co_chmod(s, &fidp->path, v9iattr.mode);
+ if (err < 0) {
+ goto out;
}
- err = v9fs_do_chown(s, &vs->fidp->path, vs->v9iattr.uid,
- vs->v9iattr.gid);
}
- v9fs_setattr_post_chown(s, vs, err);
- return;
-
-out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
-}
-
-static void v9fs_setattr_post_chmod(V9fsState *s, V9fsSetattrState *vs, int
err)
-{
- if (err == -1) {
- err = -errno;
- goto out;
- }
-
- if (vs->v9iattr.valid & (ATTR_ATIME | ATTR_MTIME)) {
+ if (v9iattr.valid & (ATTR_ATIME | ATTR_MTIME)) {
struct timespec times[2];
- if (vs->v9iattr.valid & ATTR_ATIME) {
- if (vs->v9iattr.valid & ATTR_ATIME_SET) {
- times[0].tv_sec = vs->v9iattr.atime_sec;
- times[0].tv_nsec = vs->v9iattr.atime_nsec;
+ if (v9iattr.valid & ATTR_ATIME) {
+ if (v9iattr.valid & ATTR_ATIME_SET) {
+ times[0].tv_sec = v9iattr.atime_sec;
+ times[0].tv_nsec = v9iattr.atime_nsec;
} else {
times[0].tv_nsec = UTIME_NOW;
}
} else {
times[0].tv_nsec = UTIME_OMIT;
}
-
- if (vs->v9iattr.valid & ATTR_MTIME) {
- if (vs->v9iattr.valid & ATTR_MTIME_SET) {
- times[1].tv_sec = vs->v9iattr.mtime_sec;
- times[1].tv_nsec = vs->v9iattr.mtime_nsec;
+ if (v9iattr.valid & ATTR_MTIME) {
+ if (v9iattr.valid & ATTR_MTIME_SET) {
+ times[1].tv_sec = v9iattr.mtime_sec;
+ times[1].tv_nsec = v9iattr.mtime_nsec;
} else {
times[1].tv_nsec = UTIME_NOW;
}
} else {
times[1].tv_nsec = UTIME_OMIT;
}
- err = v9fs_do_utimensat(s, &vs->fidp->path, times);
+ err = v9fs_co_utimensat(s, &fidp->path, times);
+ if (err < 0) {
+ goto out;
+ }
}
- v9fs_setattr_post_utimensat(s, vs, err);
- return;
-
-out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
-}
-
-static void v9fs_setattr(void *opaque)
-{
- V9fsPDU *pdu = opaque;
- V9fsState *s = pdu->s;
- int32_t fid;
- V9fsSetattrState *vs;
- int err = 0;
-
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- pdu_unmarshal(pdu, vs->offset, "dI", &fid, &vs->v9iattr);
-
- vs->fidp = lookup_fid(s, fid);
- if (vs->fidp == NULL) {
- err = -EINVAL;
- goto out;
+ /*
+ * If the only valid entry in iattr is ctime we can call
+ * chown(-1,-1) to update the ctime of the file
+ */
+ if ((v9iattr.valid & (ATTR_UID | ATTR_GID)) ||
+ ((v9iattr.valid & ATTR_CTIME)
+ && !((v9iattr.valid & ATTR_MASK) & ~ATTR_CTIME))) {
+ if (!(v9iattr.valid & ATTR_UID)) {
+ v9iattr.uid = -1;
+ }
+ if (!(v9iattr.valid & ATTR_GID)) {
+ v9iattr.gid = -1;
+ }
+ err = v9fs_co_chown(s, &fidp->path, v9iattr.uid,
+ v9iattr.gid);
+ if (err < 0) {
+ goto out;
+ }
}
-
- if (vs->v9iattr.valid & ATTR_MODE) {
- err = v9fs_do_chmod(s, &vs->fidp->path, vs->v9iattr.mode);
+ if (v9iattr.valid & (ATTR_SIZE)) {
+ err = v9fs_co_truncate(s, &fidp->path, v9iattr.size);
+ if (err < 0) {
+ goto out;
+ }
}
-
- v9fs_setattr_post_chmod(s, vs, err);
- return;
-
+ err = offset;
out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
+ complete_pdu(s, pdu, err);
}
static void v9fs_walk_complete(V9fsState *s, V9fsWalkState *vs, int err)
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 9747ee9..2976433 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -374,14 +374,6 @@ typedef struct V9fsIattr
int64_t mtime_nsec;
} V9fsIattr;
-typedef struct V9fsSetattrState
-{
- V9fsPDU *pdu;
- size_t offset;
- V9fsIattr v9iattr;
- V9fsFidState *fidp;
-} V9fsSetattrState;
-
struct virtio_9p_config
{
/* number of characters in tag */
--
1.7.1
- [Qemu-devel] [V3 02/24] [virtio-9p] Change all pdu handlers to coroutines., (continued)
- [Qemu-devel] [V3 02/24] [virtio-9p] Change all pdu handlers to coroutines., Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 06/24] [virtio-9p] Remove post functions for v9fs_mkdir., Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 09/24] hw/9pfs: Update v9fs_readdir to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 05/24] [virtio-9p] coroutines for readlink, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 10/24] hw/9pfs: Add yield support to statfs coroutine, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 04/24] [virtio-9p] clean up v9fs_readlink., Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 07/24] [virtio-9p] clean up v9fs_mkdir., Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 08/24] hw/9pfs: Add yield support for readdir related coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 11/24] hw/9pfs: Update v9fs_statfs to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 12/24] hw/9pfs: Add yield support to lstat coroutine, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 15/24] hw/9pfs: Update v9fs_setattr to use coroutines,
Venkateswararao Jujjuri (JV) <=
- [Qemu-devel] [V3 14/24] hw/9pfs: Add yield support to setattr related coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 13/24] hw/9pfs: Update v9fs_getattr to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 01/24] [virtio-9p] Add infrastructure to support glib threads and coroutines., Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 17/24] hw/9pfs: Update v9fs_xattrwalk to coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 18/24] hw/9pfs: Update v9fs_xattrcreate to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 16/24] hw/9pfs: Add yield support to xattr related coroutine, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 20/24] hw/9pfs: Update v9fs_mknod to use coroutines, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 19/24] hw/9pfs: Add yield support to mknod coroutine, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 21/24] [virtio-9p] coroutine and threading for mkdir, Venkateswararao Jujjuri (JV), 2011/05/18
- [Qemu-devel] [V3 22/24] [virtio-9p] Remove post functions for v9fs_remove, Venkateswararao Jujjuri (JV), 2011/05/18