From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48967) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPNtS-000819-97 for qemu-devel@nongnu.org; Wed, 25 May 2011 19:53:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QPNtN-0007T4-Ra for qemu-devel@nongnu.org; Wed, 25 May 2011 19:53:38 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:39657) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QPNtN-0007Sy-Ky for qemu-devel@nongnu.org; Wed, 25 May 2011 19:53:33 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4PNerPi029557 for ; Wed, 25 May 2011 17:40:53 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p4PNrSKJ206878 for ; Wed, 25 May 2011 17:53:28 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p4PHr1Xm018311 for ; Wed, 25 May 2011 11:53:01 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Wed, 25 May 2011 16:52:56 -0700 Message-Id: <1306367597-797-9-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1306367597-797-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1306367597-797-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 08/29] [virtio-9p] Remove post functions for v9fs_lcreate List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Venkateswararao Jujjuri (JV)" , stefanha@linux.vnet.ibm.com Signed-off-by: Venkateswararao Jujjuri " --- hw/9pfs/virtio-9p.c | 79 +++++++++++++++----------------------------------- 1 files changed, 24 insertions(+), 55 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 2cb406b..a43a58f 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -1608,57 +1608,6 @@ out: complete_pdu(s, pdu, err); } -static void v9fs_post_lcreate(V9fsState *s, V9fsLcreateState *vs, int err) -{ - if (err == 0) { - v9fs_string_copy(&vs->fidp->path, &vs->fullname); - stat_to_qid(&vs->stbuf, &vs->qid); - vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, - vs->iounit); - err = vs->offset; - } else { - vs->fidp->fid_type = P9_FID_NONE; - err = -errno; - if (vs->fidp->fs.fd > 0) { - close(vs->fidp->fs.fd); - } - } - - complete_pdu(s, vs->pdu, err); - v9fs_string_free(&vs->name); - v9fs_string_free(&vs->fullname); - qemu_free(vs); -} - -static void v9fs_lcreate_post_get_iounit(V9fsState *s, V9fsLcreateState *vs, - int err) -{ - if (err) { - err = -errno; - goto out; - } - err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf); - -out: - v9fs_post_lcreate(s, vs, err); -} - -static void v9fs_lcreate_post_do_open2(V9fsState *s, V9fsLcreateState *vs, - int err) -{ - if (vs->fidp->fs.fd == -1) { - err = -errno; - goto out; - } - vs->fidp->fid_type = P9_FID_FILE; - vs->iounit = get_iounit(s, &vs->fullname); - v9fs_lcreate_post_get_iounit(s, vs, err); - return; - -out: - v9fs_post_lcreate(s, vs, err); -} - static void v9fs_lcreate(void *opaque) { V9fsPDU *pdu = opaque; @@ -1684,19 +1633,39 @@ static void v9fs_lcreate(void *opaque) } v9fs_string_sprintf(&vs->fullname, "%s/%s", vs->fidp->path.data, - vs->name.data); + vs->name.data); /* Ignore direct disk access hint until the server supports it. */ flags &= ~O_DIRECT; vs->fidp->fs.fd = v9fs_do_open2(s, vs->fullname.data, vs->fidp->uid, - gid, flags, mode); - v9fs_lcreate_post_do_open2(s, vs, err); - return; + gid, flags, mode); + if (vs->fidp->fs.fd == -1) { + err = -errno; + goto out; + } + vs->fidp->fid_type = P9_FID_FILE; + vs->iounit = get_iounit(s, &vs->fullname); + + err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf); + if (err == 0) { + v9fs_string_copy(&vs->fidp->path, &vs->fullname); + stat_to_qid(&vs->stbuf, &vs->qid); + vs->offset += pdu_marshal(vs->pdu, vs->offset, "Qd", &vs->qid, + vs->iounit); + err = vs->offset; + } else { + vs->fidp->fid_type = P9_FID_NONE; /*TODO:Why are we keeping this fid?*/ + err = -errno; + if (vs->fidp->fs.fd > 0) { + close(vs->fidp->fs.fd); + } + } out: complete_pdu(s, vs->pdu, err); v9fs_string_free(&vs->name); + v9fs_string_free(&vs->fullname); qemu_free(vs); } -- 1.7.1