From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50393) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxY-0000kY-Gh for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKcxX-0001mi-E2 for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:12 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:56376) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxX-0001mI-5C for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:11 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4CKtDPO005616 for ; Thu, 12 May 2011 14:55:13 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v9.1) with ESMTP id p4CKw2Cf147554 for ; Thu, 12 May 2011 14:58:02 -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 p4CEvZ4F031885 for ; Thu, 12 May 2011 08:57:35 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Thu, 12 May 2011 13:57:25 -0700 Message-Id: <1305233867-4367-4-git-send-email-jvrao@linux.vnet.ibm.com> In-Reply-To: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 03/25] [virtio-9p] Remove post functions for v9fs_readlink. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri (JV)" , stefanha@linux.vnet.ibm.com In the process of preparation for coroutine threads, remove all post functions and make the function more readable. Signed-off-by: Venkateswararao Jujjuri " --- hw/9pfs/virtio-9p.c | 25 +++++++------------------ 1 files changed, 7 insertions(+), 18 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index e308e9b..0b38868 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -3637,21 +3637,6 @@ out: qemu_free(copdu); } -static void v9fs_readlink_post_readlink(V9fsState *s, V9fsReadLinkState *vs, - int err) -{ - if (err < 0) { - err = -errno; - goto out; - } - vs->offset += pdu_marshal(vs->pdu, vs->offset, "s", &vs->target); - err = vs->offset; -out: - complete_pdu(s, vs->pdu, err); - v9fs_string_free(&vs->target); - qemu_free(vs); -} - static void v9fs_readlink(void *opaque) { V9fsCoPdu *copdu = opaque; @@ -3667,7 +3652,6 @@ static void v9fs_readlink(void *opaque) vs->offset = 7; pdu_unmarshal(vs->pdu, vs->offset, "d", &fid); - fidp = lookup_fid(s, fid); if (fidp == NULL) { err = -ENOENT; @@ -3676,8 +3660,13 @@ static void v9fs_readlink(void *opaque) v9fs_string_init(&vs->target); err = v9fs_do_readlink(s, &fidp->path, &vs->target); - v9fs_readlink_post_readlink(s, vs, err); - return; + if (err < 0) { + err = -errno; + goto out; + } + vs->offset += pdu_marshal(vs->pdu, vs->offset, "s", &vs->target); + err = vs->offset; + v9fs_string_free(&vs->target); out: complete_pdu(s, vs->pdu, err); qemu_free(vs); -- 1.7.1