From patchwork Thu May 12 20:57:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: jvrao X-Patchwork-Id: 95381 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 84073B6F00 for ; Fri, 13 May 2011 07:06:19 +1000 (EST) Received: from localhost ([::1]:44455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKd5M-0005v8-Je for incoming@patchwork.ozlabs.org; Thu, 12 May 2011 17:06:16 -0400 Received: from eggs.gnu.org ([140.186.70.92]:50729) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxv-0001PQ-PI for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKcxu-000226-Q2 for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:35 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:42895) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKcxu-00021r-IA for qemu-devel@nongnu.org; Thu, 12 May 2011 16:58:34 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p4CKpQw4015124 for ; Thu, 12 May 2011 14:51:26 -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 p4CKw7B8109550 for ; Thu, 12 May 2011 14:58:07 -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 p4CEvdN9032104 for ; Thu, 12 May 2011 08:57:40 -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 p4CEvUhO031551; Thu, 12 May 2011 08:57:38 -0600 From: "Venkateswararao Jujjuri (JV)" To: qemu-devel@nongnu.org Date: Thu, 12 May 2011 13:57:30 -0700 Message-Id: <1305233867-4367-9-git-send-email-jvrao@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305233867-4367-1-git-send-email-jvrao@linux.vnet.ibm.com> References: <1305233867-4367-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] [PATCH 08/25] [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 | 39 +++++++++++++++++---------------------- 1 files changed, 17 insertions(+), 22 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index af0143d..883eced 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -3360,47 +3360,42 @@ out: static void v9fs_mkdir(void *opaque) { V9fsCoPdu *copdu = opaque; - V9fsState *s = copdu->s; - V9fsPDU *pdu = copdu->pdu; + 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(copdu->pdu, offset, "dsdd", &fid, &name, &mode, &gid); - fidp = lookup_fid(s, fid); + fidp = lookup_fid(copdu->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(copdu->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(copdu->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(copdu->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(copdu->s, copdu->pdu, err); + v9fs_string_free(&fullname); + v9fs_string_free(&name); qemu_free(copdu); }