From: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
Signed-off-by: Venkateswararao Jujjuri "<jv...@linux.vnet.ibm.com>
---
hw/9pfs/virtio-9p.c | 92 ++++++++++++++++++++++++--------------------------
hw/9pfs/virtio-9p.h | 22 ------------
2 files changed, 44 insertions(+), 70 deletions(-)
diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 148382d..86e9482 100644
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -3075,80 +3075,76 @@ out:
qemu_free(copdu);
}
-static void v9fs_statfs_post_statfs(V9fsState *s, V9fsStatfsState *vs, int err)
-{
+static int v9fs_fill_statfs(V9fsState *s, V9fsPDU *pdu, struct statfs *stbuf)
+{
+ uint32_t f_type;
+ uint32_t f_bsize;
+ uint64_t f_blocks;
+ uint64_t f_bfree;
+ uint64_t f_bavail;
+ uint64_t f_files;
+ uint64_t f_ffree;
+ uint64_t fsid_val;
+ uint32_t f_namelen;
+ size_t offset = 7;
int32_t bsize_factor;
- if (err) {
- err = -errno;
- goto out;
- }
-
/*
* compute bsize factor based on host file system block size
* and client msize
*/
- bsize_factor = (s->msize - P9_IOHDRSZ)/vs->stbuf.f_bsize;
+ bsize_factor = (s->msize - P9_IOHDRSZ)/stbuf->f_bsize;
if (!bsize_factor) {
bsize_factor = 1;
}
- vs->v9statfs.f_type = vs->stbuf.f_type;
- vs->v9statfs.f_bsize = vs->stbuf.f_bsize;
- vs->v9statfs.f_bsize *= bsize_factor;
+ f_type = stbuf->f_type;
+ f_bsize = stbuf->f_bsize;
+ f_bsize *= bsize_factor;
/*
* f_bsize is adjusted(multiplied) by bsize factor, so we need to
* adjust(divide) the number of blocks, free blocks and available
* blocks by bsize factor
*/
- vs->v9statfs.f_blocks = vs->stbuf.f_blocks/bsize_factor;
- vs->v9statfs.f_bfree = vs->stbuf.f_bfree/bsize_factor;
- vs->v9statfs.f_bavail = vs->stbuf.f_bavail/bsize_factor;
- vs->v9statfs.f_files = vs->stbuf.f_files;
- vs->v9statfs.f_ffree = vs->stbuf.f_ffree;
- vs->v9statfs.fsid_val = (unsigned int) vs->stbuf.f_fsid.__val[0] |
- (unsigned long long)vs->stbuf.f_fsid.__val[1] << 32;
- vs->v9statfs.f_namelen = vs->stbuf.f_namelen;
-
- vs->offset += pdu_marshal(vs->pdu, vs->offset, "ddqqqqqqd",
- vs->v9statfs.f_type, vs->v9statfs.f_bsize, vs->v9statfs.f_blocks,
- vs->v9statfs.f_bfree, vs->v9statfs.f_bavail, vs->v9statfs.f_files,
- vs->v9statfs.f_ffree, vs->v9statfs.fsid_val,
- vs->v9statfs.f_namelen);
+ f_blocks = stbuf->f_blocks/bsize_factor;
+ f_bfree = stbuf->f_bfree/bsize_factor;
+ f_bavail = stbuf->f_bavail/bsize_factor;
+ f_files = stbuf->f_files;
+ f_ffree = stbuf->f_ffree;
+ fsid_val = (unsigned int) stbuf->f_fsid.__val[0] |
+ (unsigned long long)stbuf->f_fsid.__val[1] << 32;
+ f_namelen = stbuf->f_namelen;
-out:
- complete_pdu(s, vs->pdu, vs->offset);
- qemu_free(vs);
+ return pdu_marshal(pdu, offset, "ddqqqqqqd",
+ f_type, f_bsize, f_blocks, f_bfree,
+ f_bavail, f_files, f_ffree,
+ fsid_val, f_namelen);
}
static void v9fs_statfs(void *opaque)
{
+ int32_t fid;
+ ssize_t retval = 0;
+ size_t offset = 7;
+ V9fsFidState *fidp;
+ struct statfs stbuf;
V9fsCoPdu *copdu = opaque;
V9fsState *s = copdu->s;
V9fsPDU *pdu = copdu->pdu;
- V9fsStatfsState *vs;
- ssize_t err = 0;
- vs = qemu_malloc(sizeof(*vs));
- vs->pdu = pdu;
- vs->offset = 7;
-
- memset(&vs->v9statfs, 0, sizeof(vs->v9statfs));
-
- pdu_unmarshal(vs->pdu, vs->offset, "d", &vs->fid);
-
- vs->fidp = lookup_fid(s, vs->fid);
- if (vs->fidp == NULL) {
- err = -ENOENT;
+ pdu_unmarshal(pdu, offset, "d", &fid);
+ fidp = lookup_fid(s, fid);
+ if (fidp == NULL) {
+ retval = -ENOENT;
goto out;
}
-
- err = v9fs_do_statfs(s, &vs->fidp->path, &vs->stbuf);
- v9fs_statfs_post_statfs(s, vs, err);
- return;
-
+ retval = v9fs_co_statfs(s, &fidp->path, &stbuf);
+ if (retval < 0) {
+ goto out;
+ }
+ retval = offset;
+ retval += v9fs_fill_statfs(s, pdu, &stbuf);
out:
- complete_pdu(s, vs->pdu, err);
- qemu_free(vs);
+ complete_pdu(s, pdu, retval);
qemu_free(copdu);
return;
}
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index bf8f64b..ee8cb79 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -396,28 +396,6 @@ struct virtio_9p_config
uint8_t tag[0];
} __attribute__((packed));
-typedef struct V9fsStatfs
-{
- uint32_t f_type;
- uint32_t f_bsize;
- uint64_t f_blocks;
- uint64_t f_bfree;
- uint64_t f_bavail;
- uint64_t f_files;
- uint64_t f_ffree;
- uint64_t fsid_val;
- uint32_t f_namelen;
-} V9fsStatfs;
-
-typedef struct V9fsStatfsState {
- V9fsPDU *pdu;
- size_t offset;
- int32_t fid;
- V9fsStatfs v9statfs;
- V9fsFidState *fidp;
- struct statfs stbuf;
-} V9fsStatfsState;
-
typedef struct V9fsMkState {
V9fsPDU *pdu;
size_t offset;
--
1.7.1
