[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH -V4 04/28] hw/9pfs: Update v9fs_getlock to use corou
From: |
Aneesh Kumar K.V |
Subject: |
[Qemu-devel] [PATCH -V4 04/28] hw/9pfs: Update v9fs_getlock to use coroutines |
Date: |
Mon, 8 Aug 2011 22:36:31 +0530 |
Signed-off-by: Aneesh Kumar K.V <address@hidden>
---
hw/9pfs/virtio-9p.c | 42 +++++++++++++++++++-----------------------
hw/9pfs/virtio-9p.h | 9 ---------
2 files changed, 19 insertions(+), 32 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index c8dfa16..d9a55de 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -3049,42 +3049,38 @@ out:
* When a TGETLOCK request comes, always return success because all lock
* handling is done by client's VFS layer.
*/
-
static void v9fs_getlock(void *opaque)
{
+ size_t offset = 7;
+ struct stat stbuf;
+ V9fsFidState *fidp;
+ V9fsGetlock *glock;
+ int32_t fid, err = 0;
V9fsPDU *pdu = opaque;
V9fsState *s = pdu->s;
- int32_t fid, err = 0;
- V9fsGetlockState *vs;
- vs = qemu_mallocz(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- vs->glock = qemu_malloc(sizeof(*vs->glock));
- pdu_unmarshal(vs->pdu, vs->offset, "dbqqds", &fid, &vs->glock->type,
- &vs->glock->start, &vs->glock->length, &vs->glock->proc_id,
- &vs->glock->client_id);
+ glock = qemu_malloc(sizeof(*glock));
+ pdu_unmarshal(pdu, offset, "dbqqds", &fid, &glock->type,
+ &glock->start, &glock->length, &glock->proc_id,
+ &glock->client_id);
- vs->fidp = lookup_fid(s, fid);
- if (vs->fidp == NULL) {
+ fidp = lookup_fid(s, fid);
+ if (fidp == NULL) {
err = -ENOENT;
goto out;
}
-
- err = v9fs_do_fstat(s, vs->fidp->fs.fd, &vs->stbuf);
+ err = v9fs_co_fstat(s, fidp->fs.fd, &stbuf);
if (err < 0) {
- err = -errno;
goto out;
}
- vs->glock->type = F_UNLCK;
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "bqqds", vs->glock->type,
- vs->glock->start, vs->glock->length, vs->glock->proc_id,
- &vs->glock->client_id);
+ glock->type = F_UNLCK;
+ offset += pdu_marshal(pdu, offset, "bqqds", glock->type,
+ glock->start, glock->length, glock->proc_id,
+ &glock->client_id);
+ err = offset;
out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs->glock);
- qemu_free(vs);
+ complete_pdu(s, pdu, err);
+ qemu_free(glock);
}
static void v9fs_mkdir(void *opaque)
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 0c1e3ee..edf3413 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -412,15 +412,6 @@ typedef struct V9fsGetlock
V9fsString client_id;
} V9fsGetlock;
-typedef struct V9fsGetlockState
-{
- V9fsPDU *pdu;
- size_t offset;
- struct stat stbuf;
- V9fsFidState *fidp;
- V9fsGetlock *glock;
-} V9fsGetlockState;
-
size_t pdu_packunpack(void *addr, struct iovec *sg, int sg_count,
size_t offset, size_t size, int pack);
--
1.7.4.1
- [Qemu-devel] [PATCH -V4 26/28] hw/9pfs: Add yield support for preadv coroutine, (continued)
- [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
- [Qemu-devel] [PATCH -V4 19/28] [virtio-9p] clean up v9fs_symlink, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 04/28] hw/9pfs: Update v9fs_getlock to use coroutines,
Aneesh Kumar K.V <=
- [Qemu-devel] [PATCH -V4 13/28] hw/9pfs: Update v9fs_clunk to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 05/28] hw/9pfs: Add yield support for open and opendir coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 17/28] [virtio-9p] clean up v9fs_create Rearrange the code, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 12/28] hw/9pfs: Add yeild support for clunk related coroutine, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 21/28] [virtio-9p] coroutine and threading for v9fs_do_link, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 20/28] [virtio-9p] coroutine and threading for v9fs_do_symlink, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 28/28] use readdir_r instead of readdir for reentrancy, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 24/28] hw/9pfs: Update v9fs_wstat to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 01/28] hw/9pfs: Update vfs_rename to use coroutines, Aneesh Kumar K.V, 2011/08/08
- [Qemu-devel] [PATCH -V4 08/28] [virtio-9p] clean up v9fs_lcreate, Aneesh Kumar K.V, 2011/08/08