From patchwork Mon Aug 8 17:04:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Aneesh Kumar K.V" X-Patchwork-Id: 109001 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 C2680B6F71 for ; Tue, 9 Aug 2011 03:07:15 +1000 (EST) Received: from localhost ([::1]:44662 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTIB-0003Qd-Un for incoming@patchwork.ozlabs.org; Mon, 08 Aug 2011 13:07:07 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43649) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGN-0007tB-HC for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QqTGM-0001p0-9l for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:15 -0400 Received: from e23smtp04.au.ibm.com ([202.81.31.146]:36855) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QqTGL-0001om-OR for qemu-devel@nongnu.org; Mon, 08 Aug 2011 13:05:14 -0400 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [202.81.31.246]) by e23smtp04.au.ibm.com (8.14.4/8.13.1) with ESMTP id p78GwmrH005985 for ; Tue, 9 Aug 2011 02:58:48 +1000 Received: from d23av04.au.ibm.com (d23av04.au.ibm.com [9.190.235.139]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p78H4Hrg1273888 for ; Tue, 9 Aug 2011 03:04:17 +1000 Received: from d23av04.au.ibm.com (loopback [127.0.0.1]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p78H5BJd030219 for ; Tue, 9 Aug 2011 03:05:12 +1000 Received: from skywalker.ibm.com ([9.80.65.225]) by d23av04.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p78H4PcM029309; Tue, 9 Aug 2011 03:05:10 +1000 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Mon, 8 Aug 2011 22:34:12 +0530 Message-Id: <1312823054-28331-25-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1312823054-28331-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1312823054-28331-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 202.81.31.146 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH -V4 24/26] [virtio-9p] clean up v9fs_remove. 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 From: Venkateswararao Jujjuri (JV) Rearrange the code so that we can avoid V9fsRemoveState and additional malloc()s. Signed-off-by: Venkateswararao Jujjuri " Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p.c | 25 ++++++++++--------------- hw/9pfs/virtio-9p.h | 6 ------ 2 files changed, 10 insertions(+), 21 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index db87a11..f572053 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -2581,35 +2581,30 @@ out: static void v9fs_remove(void *opaque) { - V9fsPDU *pdu = opaque; - V9fsState *s = pdu->s; int32_t fid; - V9fsRemoveState *vs; int err = 0; + size_t offset = 7; + V9fsFidState *fidp; + V9fsPDU *pdu = opaque; - vs = qemu_malloc(sizeof(*vs)); - vs->pdu = pdu; - vs->offset = 7; - - pdu_unmarshal(vs->pdu, vs->offset, "d", &fid); + pdu_unmarshal(pdu, offset, "d", &fid); - vs->fidp = lookup_fid(s, fid); - if (vs->fidp == NULL) { + fidp = lookup_fid(pdu->s, fid); + if (fidp == NULL) { err = -EINVAL; goto out; } - err = v9fs_do_remove(s, &vs->fidp->path); + err = v9fs_do_remove(pdu->s, &fidp->path); if (err < 0) { err = -errno; } else { - err = vs->offset; + err = offset; } /* For TREMOVE we need to clunk the fid even on failed remove */ - free_fid(s, vs->fidp->fid); + free_fid(pdu->s, fidp->fid); out: - complete_pdu(s, pdu, err); - qemu_free(vs); + complete_pdu(pdu->s, pdu, err); } static void v9fs_wstat_post_truncate(V9fsState *s, V9fsWstatState *vs, int err) diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h index 3ed46ab..194f0ea 100644 --- a/hw/9pfs/virtio-9p.h +++ b/hw/9pfs/virtio-9p.h @@ -333,12 +333,6 @@ typedef struct V9fsWriteState { int cnt; } V9fsWriteState; -typedef struct V9fsRemoveState { - V9fsPDU *pdu; - size_t offset; - V9fsFidState *fidp; -} V9fsRemoveState; - typedef struct V9fsWstatState { V9fsPDU *pdu;