From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54238) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQv-0005wH-Tu for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMtQv-0004zL-3Z for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:53 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:36216) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQu-0004zE-UN for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:53 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4J2q3K4028518 for ; Wed, 18 May 2011 20:52:03 -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 p4J2vked110352 for ; Wed, 18 May 2011 20:57:46 -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 p4IKvIri016358 for ; Wed, 18 May 2011 14:57:19 -0600 From: "Venkateswararao Jujjuri (JV)" Date: Wed, 18 May 2011 19:57:13 -0700 Message-Id: <1305773834-16359-24-git-send-email-jvrao@linux.vnet.ibm.com> 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> Subject: [Qemu-devel] [V3 23/24] [virtio-9p] clean up v9fs_remove. 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 Rearrange the code so that we can avoid V9fsRemoveState and additional malloc()s. Signed-off-by: Venkateswararao Jujjuri " --- 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 1e860c6..7327b3b 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -2582,35 +2582,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 d57d5ae..837ce67 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; -- 1.7.1