From patchwork Mon Jun 6 12:32:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 9158009 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0AB34607FD for ; Mon, 6 Jun 2016 12:34:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F029A254F7 for ; Mon, 6 Jun 2016 12:34:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E50A32665D; Mon, 6 Jun 2016 12:34:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, MSGID_FROM_MTA_HEADER,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B5D69254F7 for ; Mon, 6 Jun 2016 12:34:13 +0000 (UTC) Received: from localhost ([::1]:41944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tjQ-0001Ot-Ui for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Jun 2016 08:34:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tin-0001It-OK for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b9tif-0001PC-M3 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:32 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:51406) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b9tif-0001P8-H6 for qemu-devel@nongnu.org; Mon, 06 Jun 2016 08:33:25 -0400 Received: from pps.filterd (m0048817.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u56CTla1009756 for ; Mon, 6 Jun 2016 08:33:25 -0400 Message-Id: <201606061233.u56CTla1009756@mx0a-001b2d01.pphosted.com> Received: from e06smtp09.uk.ibm.com (e06smtp09.uk.ibm.com [195.75.94.105]) by mx0b-001b2d01.pphosted.com with ESMTP id 23d3u4t9ax-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 06 Jun 2016 08:33:24 -0400 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Jun 2016 13:33:22 +0100 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp09.uk.ibm.com (192.168.101.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 6 Jun 2016 13:33:16 +0100 X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: gkurz@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6EFD01B0805F for ; Mon, 6 Jun 2016 13:34:20 +0100 (BST) Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u56CXFbd12517658 for ; Mon, 6 Jun 2016 12:33:15 GMT Received: from d06av08.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u56CXE7M023227 for ; Mon, 6 Jun 2016 06:33:15 -0600 Received: from smtp.lab.toulouse-stg.fr.ibm.com (srv01.lab.toulouse-stg.fr.ibm.com [9.101.4.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u56CXE2J023213; Mon, 6 Jun 2016 06:33:14 -0600 Received: from bahia.huguette.org (icon-9-164-139-228.megacenter.de.ibm.com [9.164.139.228]) by smtp.lab.toulouse-stg.fr.ibm.com (Postfix) with ESMTP id 8DECF220164; Mon, 6 Jun 2016 14:33:12 +0200 (CEST) From: Greg Kurz To: qemu-devel@nongnu.org Date: Mon, 6 Jun 2016 14:32:42 +0200 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465216365-13078-1-git-send-email-gkurz@linux.vnet.ibm.com> References: <1465216365-13078-1-git-send-email-gkurz@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16060612-0036-0000-0000-000001E882C0 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16060612-0037-0000-0000-0000113D36A6 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-06_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=75 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606060149 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.158.5 Subject: [Qemu-devel] [PULL 4/7] 9p: drop useless out: label X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , "Aneesh Kumar K.V" , Greg Kurz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Reviewed-by: Eric Blake Signed-off-by: Greg Kurz --- hw/9pfs/9p.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index a71d44dc7420..42ac4d79fbe3 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -1642,15 +1642,15 @@ static int v9fs_do_readdir_with_stat(V9fsPDU *pdu, } err = v9fs_co_name_to_path(pdu, &fidp->path, dent->d_name, &path); if (err < 0) { - goto out; + break; } err = v9fs_co_lstat(pdu, &path, &stbuf); if (err < 0) { - goto out; + break; } err = stat_to_v9stat(pdu, &path, &stbuf, &v9stat); if (err < 0) { - goto out; + break; } /* 11 = 7 + 4 (7 = start offset, 4 = space for storing count) */ len = pdu_marshal(pdu, 11 + count, "S", &v9stat); @@ -1667,7 +1667,7 @@ static int v9fs_do_readdir_with_stat(V9fsPDU *pdu, v9fs_path_free(&path); saved_dir_pos = dent->d_off; } -out: + g_free(dent); v9fs_path_free(&path); if (err < 0) {