From patchwork Thu May 19 02:56:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 96292 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 A2F13B6F77 for ; Thu, 19 May 2011 13:02:05 +1000 (EST) Received: from localhost ([::1]:52418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtUw-0004YV-N6 for incoming@patchwork.ozlabs.org; Wed, 18 May 2011 23:02:02 -0400 Received: from eggs.gnu.org ([140.186.70.92]:35709) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQb-0005FJ-9Z for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QMtQZ-0004tY-Dk for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:33 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:50621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QMtQZ-0004tG-8O for qemu-devel@nongnu.org; Wed, 18 May 2011 22:57:31 -0400 Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4J2oIBX004461 for ; Wed, 18 May 2011 20:50:18 -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 p4J2vPjM139738 for ; Wed, 18 May 2011 20:57:25 -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 p4IKuvpv015257 for ; Wed, 18 May 2011 14:56:58 -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 p4IKuo4S014807; Wed, 18 May 2011 14:56:56 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Wed, 18 May 2011 19:56:57 -0700 Message-Id: <1305773834-16359-8-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.151 Cc: aliguori@us.ibm.com, "Venkateswararao Jujjuri \(JV\)" , stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [V3 07/24] [virtio-9p] clean up v9fs_mkdir. 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 Rearrange the code so that we can avoid V9fsMkState and additional malloc()s. Signed-off-by: Venkateswararao Jujjuri " --- hw/9pfs/virtio-9p.c | 38 +++++++++++++++++--------------------- 1 files changed, 17 insertions(+), 21 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index f2794d4..54976c4 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -3311,46 +3311,42 @@ out: static void v9fs_mkdir(void *opaque) { V9fsPDU *pdu = opaque; - V9fsState *s = pdu->s; + size_t offset = 7; int32_t fid; - V9fsMkState *vs; - int err = 0; + struct stat stbuf; + V9fsString name, fullname; + V9fsQID qid; V9fsFidState *fidp; gid_t gid; int mode; + int err = 0; - vs = qemu_malloc(sizeof(*vs)); - vs->pdu = pdu; - vs->offset = 7; - - v9fs_string_init(&vs->fullname); - pdu_unmarshal(vs->pdu, vs->offset, "dsdd", &fid, &vs->name, &mode, - &gid); + v9fs_string_init(&fullname); + pdu_unmarshal(pdu, offset, "dsdd", &fid, &name, &mode, &gid); - fidp = lookup_fid(s, fid); + fidp = lookup_fid(pdu->s, fid); if (fidp == NULL) { err = -ENOENT; goto out; } - v9fs_string_sprintf(&vs->fullname, "%s/%s", fidp->path.data, vs->name.data); - err = v9fs_do_mkdir(s, vs->fullname.data, mode, fidp->uid, gid); + v9fs_string_sprintf(&fullname, "%s/%s", fidp->path.data, name.data); + err = v9fs_do_mkdir(pdu->s, fullname.data, mode, fidp->uid, gid); if (err == -1) { err = -errno; goto out; } - err = v9fs_do_lstat(s, &vs->fullname, &vs->stbuf); + err = v9fs_do_lstat(pdu->s, &fullname, &stbuf); if (err == -1) { err = -errno; goto out; } - stat_to_qid(&vs->stbuf, &vs->qid); - vs->offset += pdu_marshal(vs->pdu, vs->offset, "Q", &vs->qid); - err = vs->offset; + stat_to_qid(&stbuf, &qid); + offset += pdu_marshal(pdu, offset, "Q", &qid); + err = offset; out: - complete_pdu(s, vs->pdu, err); - v9fs_string_free(&vs->fullname); - v9fs_string_free(&vs->name); - qemu_free(vs); + complete_pdu(pdu->s, pdu, err); + v9fs_string_free(&fullname); + v9fs_string_free(&name); } static void v9fs_post_xattr_getvalue(V9fsState *s, V9fsXattrState *vs, int err)