From patchwork Thu May 19 02:56:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96281 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 AEBC8B6F6E for ; Thu, 19 May 2011 12:57:58 +1000 (EST) Received: from localhost ([::1]:37949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQw-0005Ck-BB for incoming@patchwork.ozlabs.org; Wed, 18 May 2011 22:57:54 -0400 Received: from eggs.gnu.org ([140.186.70.92]:35669) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQX-0005CT-Af for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMtQW-0004sh-2m for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:29 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:55694) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQV-0004sT-QC for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:27 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e34.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4J2ioW9004005 for ; Wed, 18 May 2011 20:44:50 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p4J2vKlP162834 for ; Wed, 18 May 2011 20:57:20 -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 p4IKurPR015057 for ; Wed, 18 May 2011 14:56:53 -0600 Received: from oc6675851006.ibm.com (sig-9-65-27-236.mts.ibm.com [9.65.27.236]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p4IKuo4O014807; Wed, 18 May 2011 14:56:52 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Wed, 18 May 2011 19:56:53 -0700 Message-Id: <1305773834-16359-4-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305773834-16359-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305773834-16359-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.152 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [V3 03/24] [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 | 29 +++++++++-------------------- 1 files changed, 9 insertions(+), 20 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 15bfea7..d931a7a 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -1950,13 +1950,13 @@ static void v9fs_read_post_seekdir(V9fsState *s, V9fsReadState *vs, ssize_t err) if (err) { goto out; } - v9fs_stat_free(&vs->v9stat); - v9fs_string_free(&vs->name); vs->offset += pdu_marshal(vs->pdu, vs->offset, "d", vs->count); vs->offset += vs->count; err = vs->offset; out: complete_pdu(s, vs->pdu, err); + v9fs_stat_free(&vs->v9stat); + v9fs_string_free(&vs->name); qemu_free(vs); return; } @@ -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,10 +3605,15 @@ 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; out: complete_pdu(s, vs->pdu, err); + v9fs_string_free(&vs->target); qemu_free(vs); }