From patchwork Thu Mar 15 05:58:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Bur X-Patchwork-Id: 886559 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 402QkF23Dkz9sVP for ; Fri, 16 Mar 2018 11:07:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 402QkD72hBzF1Wj for ; Fri, 16 Mar 2018 11:07:00 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=au1.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=cyril.bur@au1.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=au1.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 402QgL3nRRzF1Mb for ; Fri, 16 Mar 2018 11:04:30 +1100 (AEDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w2FNxGtJ126393 for ; Thu, 15 Mar 2018 20:04:27 -0400 Received: from e06smtp15.uk.ibm.com (e06smtp15.uk.ibm.com [195.75.94.111]) by mx0b-001b2d01.pphosted.com with ESMTP id 2gr0k9w0ts-1 (version=TLSv1.2 cipher=AES256-SHA256 bits=256 verify=NOT) for ; Thu, 15 Mar 2018 20:04:27 -0400 Received: from localhost by e06smtp15.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 16 Mar 2018 00:04:26 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp15.uk.ibm.com (192.168.101.145) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 16 Mar 2018 00:04:23 -0000 Received: from d06av24.portsmouth.uk.ibm.com (d06av24.portsmouth.uk.ibm.com [9.149.105.60]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w2G04MKN52101200 for ; Fri, 16 Mar 2018 00:04:22 GMT Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C6CC042049 for ; Thu, 15 Mar 2018 23:56:35 +0000 (GMT) Received: from d06av24.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 80E514204C for ; Thu, 15 Mar 2018 23:56:35 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.192.253.14]) by d06av24.portsmouth.uk.ibm.com (Postfix) with ESMTP for ; Thu, 15 Mar 2018 23:56:35 +0000 (GMT) Received: from camb691.ozlabs.ibm.com (unknown [9.192.254.114]) (using TLSv1.2 with cipher DHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id 6CCC9A03BE for ; Thu, 15 Mar 2018 16:58:43 +1100 (AEDT) From: Cyril Bur To: skiboot@lists.ozlabs.org Date: Thu, 15 Mar 2018 16:58:17 +1100 X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180315055827.8999-1-cyril.bur@au1.ibm.com> References: <20180315055827.8999-1-cyril.bur@au1.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18031600-0020-0000-0000-00000405A8B0 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18031600-0021-0000-0000-00004299B32D Message-Id: <20180315055827.8999-6-cyril.bur@au1.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2018-03-15_12:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=3 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1803150258 Subject: [Skiboot] [PATCH 05/15] libflash/libffs: ffs_close() should use ffs_hdr_free() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Signed-off-by: Cyril Bur --- libflash/libffs.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/libflash/libffs.c b/libflash/libffs.c index abc61389..4f1852ff 100644 --- a/libflash/libffs.c +++ b/libflash/libffs.c @@ -440,14 +440,32 @@ out: return rc; } -void ffs_close(struct ffs_handle *ffs) +static void __hdr_free(struct ffs_hdr *hdr) { struct ffs_entry *ent, *next; - list_for_each_safe(&ffs->hdr.entries, ent, next, list) { + list_for_each_safe(&hdr->entries, ent, next, list) { list_del(&ent->list); free(ent); } + if (hdr->side) { + hdr->side->side = NULL; + ffs_hdr_free(hdr->side); + } +} + +int ffs_hdr_free(struct ffs_hdr *hdr) +{ + printf("Freeing hdr\n"); + __hdr_free(hdr); + free(hdr); + + return 0; +} + +void ffs_close(struct ffs_handle *ffs) +{ + __hdr_free(&ffs->hdr); if (ffs->cache) free(ffs->cache); @@ -903,24 +921,6 @@ int ffs_hdr_new(uint32_t block_size, uint32_t block_count, struct ffs_hdr **r) return 0; } -int ffs_hdr_free(struct ffs_hdr *hdr) -{ - struct ffs_entry *ent, *next; - - printf("Freeing hdr\n"); - list_for_each_safe(&hdr->entries, ent, next, list) { - list_del(&ent->list); - free(ent); - } - if (hdr->side) { - hdr->side->side = NULL; - ffs_hdr_free(hdr->side); - } - free(hdr); - - return 0; -} - int ffs_update_act_size(struct ffs_handle *ffs, uint32_t part_idx, uint32_t act_size) {