Message ID | 148007487565.16557.8251256690444313651.stgit@bahia |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tQF8m6Vmhz9tlB for <incoming@patchwork.ozlabs.org>; Fri, 25 Nov 2016 23:03:36 +1100 (AEDT) Received: from localhost ([::1]:45508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1cAFE6-0005Pv-9M for incoming@patchwork.ozlabs.org; Fri, 25 Nov 2016 07:03:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <groug@kaod.org>) id 1cAF5d-00070L-1u for qemu-devel@nongnu.org; Fri, 25 Nov 2016 06:54:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <groug@kaod.org>) id 1cAF5Y-0007Bv-7n for qemu-devel@nongnu.org; Fri, 25 Nov 2016 06:54:49 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:43356) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from <groug@kaod.org>) id 1cAF5X-0007Bj-Ta for qemu-devel@nongnu.org; Fri, 25 Nov 2016 06:54:44 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id uAPBs4D6088263 for <qemu-devel@nongnu.org>; Fri, 25 Nov 2016 06:54:42 -0500 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0a-001b2d01.pphosted.com with ESMTP id 26xk3rq7qc-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for <qemu-devel@nongnu.org>; Fri, 25 Nov 2016 06:54:42 -0500 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for <qemu-devel@nongnu.org> from <groug@kaod.org>; Fri, 25 Nov 2016 06:54:41 -0500 Received: from d01dlp03.pok.ibm.com (9.56.250.168) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 25 Nov 2016 06:54:38 -0500 Received: from b01cxnp22035.gho.pok.ibm.com (b01cxnp22035.gho.pok.ibm.com [9.57.198.25]) by d01dlp03.pok.ibm.com (Postfix) with ESMTP id AAC82C9003E; Fri, 25 Nov 2016 06:54:21 -0500 (EST) Received: from b01ledav004.gho.pok.ibm.com (b01ledav004.gho.pok.ibm.com [9.57.199.109]) by b01cxnp22035.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id uAPBsbn442074126; Fri, 25 Nov 2016 11:54:37 GMT Received: from b01ledav004.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A6B81112040; Fri, 25 Nov 2016 06:54:37 -0500 (EST) Received: from [192.168.66.108] (unknown [9.164.155.192]) by b01ledav004.gho.pok.ibm.com (Postfix) with ESMTP id B796A112034; Fri, 25 Nov 2016 06:54:36 -0500 (EST) From: Greg Kurz <groug@kaod.org> To: qemu-devel@nongnu.org Date: Fri, 25 Nov 2016 12:54:35 +0100 In-Reply-To: <148007485377.16557.10831635699229968727.stgit@bahia> References: <148007485377.16557.10831635699229968727.stgit@bahia> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16112511-0056-0000-0000-0000020A8D36 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006139; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000193; SDB=6.00785281; UDB=6.00379447; IPR=6.00562859; BA=6.00004909; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00013437; XFM=3.00000011; UTC=2016-11-25 11:54:39 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16112511-0057-0000-0000-0000063D9072 Message-Id: <148007487565.16557.8251256690444313651.stgit@bahia> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-11-25_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611250210 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH for-2.8 3/5] 9pfs: always free fids in virtfs_reset() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>, Stefan Hajnoczi <stefanha@redhat.com>, Greg Kurz <groug@kaod.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 3a48cdcdf975..75c6645de9ac 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -569,11 +569,7 @@ static void coroutine_fn virtfs_reset(V9fsPDU *pdu) fidp = s->fid_list; s->fid_list = fidp->next; - if (fidp->ref) { - fidp->clunked = 1; - } else { - free_fid(pdu, fidp); - } + g_assert(!fidp->ref); free_fid(pdu, fidp); } }
All PDU that may hold a reference on a fid have been cancelled: we can therefore free all the fids. Signed-off-by: Greg Kurz <groug@kaod.org> --- hw/9pfs/9p.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)