From patchwork Tue May 17 19:43:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96011 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C0342B6EED for ; Wed, 18 May 2011 05:44:59 +1000 (EST) Received: from localhost ([::1]:52585 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQCO-0002FM-Q3 for incoming@patchwork.ozlabs.org; Tue, 17 May 2011 15:44:56 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQBu-0002EY-2l for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMQBs-0001zc-EW for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:26 -0400 Received: from e37.co.us.ibm.com ([32.97.110.158]:40268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMQBs-0001zL-7A for qemu-devel@nongnu.org; Tue, 17 May 2011 15:44:24 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e37.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4HJfLni003537 for ; Tue, 17 May 2011 13:41:21 -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 p4HJiBoF121018 for ; Tue, 17 May 2011 13:44:11 -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 p4HDhgJU017248 for ; Tue, 17 May 2011 07:43:43 -0600 Received: from oc6675851006.ibm.com (dyn9047029068.beaverton.ibm.com [9.47.29.68]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4HDhZkI016491; Tue, 17 May 2011 07:43:40 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Tue, 17 May 2011 12:43:29 -0700 Message-Id: <1305661431-21289-4-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305661431-21289-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305661431-21289-1-git-send-email-jvrao@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.158 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [V2 03/25] [virtio-9p] Remove post functions for v9fs_readlink. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 15bfea7..06da2c9 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -3583,21 +3583,6 @@ out: qemu_free(vs); } -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) { V9fsPDU *pdu = opaque; @@ -3612,7 +3597,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; @@ -3621,8 +3605,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);