From patchwork Fri Sep 9 10:54:11 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: 114054 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 0AB08B6F6F for ; Fri, 9 Sep 2011 20:57:04 +1000 (EST) Received: from localhost ([::1]:33870 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1ylW-0005yv-71 for incoming@patchwork.ozlabs.org; Fri, 09 Sep 2011 06:56:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:49293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1ykD-0001gN-C2 for qemu-devel@nongnu.org; Fri, 09 Sep 2011 06:55:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R1ykC-0006WB-7M for qemu-devel@nongnu.org; Fri, 09 Sep 2011 06:55:37 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:50357) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R1ykB-0006Vt-JH for qemu-devel@nongnu.org; Fri, 09 Sep 2011 06:55:36 -0400 Received: from /spool/local by au.ibm.com with XMail ESMTP for from ; Fri, 9 Sep 2011 11:52:06 +1000 Received: from d23relay05.au.ibm.com ([202.81.31.247]) by au.ibm.com ([202.81.31.206]) with XMail ESMTP; Fri, 9 Sep 2011 11:52:05 +1000 Received: from d23av03.au.ibm.com (d23av03.au.ibm.com [9.190.234.97]) by d23relay05.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p89ArqNu1421432 for ; Fri, 9 Sep 2011 20:53:52 +1000 Received: from d23av03.au.ibm.com (loopback [127.0.0.1]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p89AtVx3031930 for ; Fri, 9 Sep 2011 20:55:31 +1000 Received: from skywalker.ibm.com ([9.124.88.8]) by d23av03.au.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p89AtCcj030876; Fri, 9 Sep 2011 20:55:29 +1000 From: "Aneesh Kumar K.V" To: qemu-devel@nongnu.org Date: Fri, 9 Sep 2011 16:24:11 +0530 Message-Id: <1315565653-14500-7-git-send-email-aneesh.kumar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1315565653-14500-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> References: <1315565653-14500-1-git-send-email-aneesh.kumar@linux.vnet.ibm.com> x-cbid: 11090901-3568-0000-0000-00000040F362 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 202.81.31.142 Cc: aliguori@us.ibm.com, "Aneesh Kumar K.V" Subject: [Qemu-devel] [PATCH 6/8] hw/9pfs: Avoid unnecessary get_fid in v9fs_clunk 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 Signed-off-by: Aneesh Kumar K.V --- hw/9pfs/virtio-9p.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c index 2a68953..e51df2a 100644 --- a/hw/9pfs/virtio-9p.c +++ b/hw/9pfs/virtio-9p.c @@ -417,7 +417,7 @@ static void put_fid(V9fsState *s, V9fsFidState *fidp) } } -static int clunk_fid(V9fsState *s, int32_t fid) +static V9fsFidState *clunk_fid(V9fsState *s, int32_t fid) { V9fsFidState **fidpp, *fidp; @@ -426,14 +426,13 @@ static int clunk_fid(V9fsState *s, int32_t fid) break; } } - if (*fidpp == NULL) { - return -ENOENT; + return NULL; } fidp = *fidpp; *fidpp = fidp->next; fidp->clunked = 1; - return 0; + return fidp; } void v9fs_reclaim_fd(V9fsState *s) @@ -1700,17 +1699,18 @@ static void v9fs_clunk(void *opaque) pdu_unmarshal(pdu, offset, "d", &fid); - fidp = get_fid(s, fid); + fidp = clunk_fid(s, fid); if (fidp == NULL) { err = -ENOENT; goto out_nofid; } - err = clunk_fid(s, fidp->fid); - if (err < 0) { - goto out; - } + /* + * Bump the ref so that put_fid will + * free the fid. + */ + fidp->ref++; err = offset; -out: + put_fid(s, fidp); out_nofid: complete_pdu(s, pdu, err);