From patchwork Mon Nov 5 11:41:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans Holmberg X-Patchwork-Id: 10667927 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 24874175A for ; Mon, 5 Nov 2018 11:42:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 12502296F8 for ; Mon, 5 Nov 2018 11:42:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 066F229712; Mon, 5 Nov 2018 11:42:28 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB2D8296F8 for ; Mon, 5 Nov 2018 11:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728874AbeKEVBp (ORCPT ); Mon, 5 Nov 2018 16:01:45 -0500 Received: from mail-it1-f194.google.com ([209.85.166.194]:38430 "EHLO mail-it1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729004AbeKEVBb (ORCPT ); Mon, 5 Nov 2018 16:01:31 -0500 Received: by mail-it1-f194.google.com with SMTP id k141-v6so10272577itk.3 for ; Mon, 05 Nov 2018 03:42:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=owltronix-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mq2pXsxBVKjyR6ETTb+oyHYfaQtkfPqHe/RfPr8ip58=; b=UgTp+ct+aU5PtwaUn6O3C8Sq3F5oN6oCcmhY9THHY5jVrBd3GYIq96ufAPzeal6VHd KZR4ZcRc9DYtRvajRD4zU+yDLPIOYON5bD9JYxRQ/DsixzE2UlPGxOlU91PzYAHhbOPN +TBJq7vlEYMASC3GV0WPvYkiXk2KxJRpVto3D9SW2vXTV8Jm81IdSiYZ8raMywmJmkhM cdy2ECWGRj6C+MwQRtBfeHUlVfm7h/i5U6RAkDOrJ8oatsjJaTxB7cqYzDb3/8BIbX5Z m+MYJhv1ssWET6hgqJnHMdTS4cs/eppFpij7y3MiG9VDYGRDVd/6SfQZtG3k6fep+4Tb BROQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mq2pXsxBVKjyR6ETTb+oyHYfaQtkfPqHe/RfPr8ip58=; b=oXrykqoN3jZyxchhwmI2cdqmu4x4QwXmZkR2QreiJdqE19uAAINDyqLEktuu2Y6shw 8rrl7d+dcUJwhnluor9T/yT0n1IzcbdoIohxGycwNYdhDQihwc21GiSty3GwQzY3ml/k Z9SicZ98SuaBHulRWF0riNb3V/IFetbqj+s/yu/vdG2HOmpOuUT0mXU2y6mxtzPOV1cm AI/A8Jjo62fOPHHB9u3EMpGIrVz2geLvf+JNB7G3HO47eGwV79UdmUHV+3W4M54A8FTS MVv5ve1HqmYzgsQJwVW7QbiW50KvMjls/k15afHpfJU4YgJeFe+pDuzISc5TM4e2MpMS Tzew== X-Gm-Message-State: AGRZ1gLkBXgOKdJsdMARkvAZ+UUtq/SD9qAcBQThAD8RciEDQkaL6G+2 7M11tVB8bu8K0gxOB3tRFBTxVA== X-Google-Smtp-Source: AJdET5cJ1rI+ft7/vUO3bvpx/k/ItUMtrMwHSZ+Go19X1/S9cXv/7cmklU8xDN77WdYuZXmDyaNj1w== X-Received: by 2002:a02:5f96:: with SMTP id x22-v6mr20275912jad.43.1541418132408; Mon, 05 Nov 2018 03:42:12 -0800 (PST) Received: from ch-lap-hans.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id 186-v6sm14880824itf.11.2018.11.05.03.42.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 03:42:11 -0800 (PST) From: Hans Holmberg X-Google-Original-From: Hans Holmberg To: Matias Bjorling Cc: Javier Gonzales , linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Holmberg , Hans Holmberg Subject: [PATCH 6/7] lightnvm: pblk: fix pblk_lines_init error handling path Date: Mon, 5 Nov 2018 12:41:12 +0100 Message-Id: <20181105114113.30932-7-hans.ml.holmberg@cnexlabs.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181105114113.30932-1-hans.ml.holmberg@cnexlabs.com> References: <20181105114113.30932-1-hans.ml.holmberg@cnexlabs.com> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Hans Holmberg From: Hans Holmberg The chunk metadata is allocated with vmalloc, so we need to use vfree to free it. Fixes: 090ee26fd512 ("lightnvm: use internal allocation for chunk log page") Signed-off-by: Hans Holmberg --- drivers/lightnvm/pblk-init.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/lightnvm/pblk-init.c b/drivers/lightnvm/pblk-init.c index 33c1e83327c3..ae9686b5d521 100644 --- a/drivers/lightnvm/pblk-init.c +++ b/drivers/lightnvm/pblk-init.c @@ -1053,7 +1053,7 @@ static int pblk_lines_init(struct pblk *pblk) pblk_line_meta_free(l_mg, &pblk->lines[i]); kfree(pblk->lines); fail_free_chunk_meta: - kfree(chunk_meta); + vfree(chunk_meta); fail_free_luns: kfree(pblk->luns); fail_free_meta: