From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752288AbcDZOf2 (ORCPT ); Tue, 26 Apr 2016 10:35:28 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:37074 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752184AbcDZOfY (ORCPT ); Tue, 26 Apr 2016 10:35:24 -0400 From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io Cc: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= Subject: [PATCH 1/2] lightnvm: free metadata dma on rrpc when needed Date: Tue, 26 Apr 2016 16:35:18 +0200 Message-Id: <1461681318-29571-3-git-send-email-javier@javigon.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461681318-29571-1-git-send-email-javier@javigon.com> References: <1461681318-29571-1-git-send-email-javier@javigon.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org rrpc has assumed that medatada is always sent as a dma buffer to the device. When this is not true, do not attempt to free a non-allocated dma region. Signed-off-by: Javier González --- drivers/lightnvm/rrpc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index a9a5fcc..ba789c3 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -707,10 +707,12 @@ static void rrpc_end_io(struct nvm_rq *rqd) rrpc_unlock_rq(rrpc, rqd); - if (npages > 1) + if (npages > 1) { nvm_dev_dma_free(rrpc->dev, rqd->ppa_list, rqd->dma_ppa_list); - if (rqd->metadata) - nvm_dev_dma_free(rrpc->dev, rqd->metadata, rqd->dma_metadata); + if (rqd->meta_list) + nvm_dev_dma_free(rrpc->dev, rqd->meta_list, + rqd->dma_meta_list); + } mempool_free(rqd, rrpc->rq_pool); } -- 2.5.0