From patchwork Fri Jul 7 19:08:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= X-Patchwork-Id: 9831027 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 AB589602BD for ; Fri, 7 Jul 2017 19:09:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7D73328549 for ; Fri, 7 Jul 2017 19:09:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F6DA286DB; Fri, 7 Jul 2017 19:09:33 +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.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=unavailable 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 021DF28549 for ; Fri, 7 Jul 2017 19:09:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751828AbdGGTJJ (ORCPT ); Fri, 7 Jul 2017 15:09:09 -0400 Received: from mail-wr0-f173.google.com ([209.85.128.173]:36092 "EHLO mail-wr0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752360AbdGGTJA (ORCPT ); Fri, 7 Jul 2017 15:09:00 -0400 Received: by mail-wr0-f173.google.com with SMTP id c11so59218435wrc.3 for ; Fri, 07 Jul 2017 12:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lightnvm-io.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mnpLkRrTZ+1Wpg9xq54FYC8chqs9Hn205fMblhj1MrQ=; b=dP8eL0yXCSOLEiIJt4NaNKd+Cwv4rVt7abd8QwiPhxgqCAChiydNQC41Yz6dhCwTmj NQWzfW35Wleh/ZKPkqrOVyGPg0jHqmlJ4FjQ2AmdrZheFXdGsxI2iCoIHWYCiiiJSLsF oFZuwvNat3hRu3I9MP4MszxVB84O9/J42PbcIRGEAnRjmHixrducYNZRS0GwMI5OED2c s+mQZNn0U5mH1pTTh/rkQqPVEW0dGgACW3QiJsGnP/Ga19ngc6NGQIfn81v7yFUv5Vaf G/QU3kt2krXQ/LpREZ5ot4Wr5Ji9bqcKXCeyOC3tUgE31tHtorYGp1VSjvhrg/asMWtL pzxw== 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:mime-version:content-transfer-encoding; bh=mnpLkRrTZ+1Wpg9xq54FYC8chqs9Hn205fMblhj1MrQ=; b=Fzz7BEIrB/uPY9tZpkbkODK0I+3JX3P+AridRnkcPBkkaHpc7dp6AbklwtOSL4tnZh QkGUSypkaNe7CVkhrwHpjAOCKO/DQnArzUKjFhym5/78JXHRq4boyF8syekYaCFqIJLf i5VSQudsfPT3kZS3vYsCSSm8NM7Vn9KGuhmkXg093fi1caQ2m0S3jzZdqL3nn62hqVWq iaoDpmYs7m4qTOhFihl2PRq0Tm4w1tej7nQtVKMsMajgkgZkkw+FvogU0D472/fxYnR7 GAvhCMk7Ub8mBrWwNY6hMW4uEE/X/cNqqs8QoYBRGYsStKxX1ldLN5GaAa8ui5oCZ0vN 8mCA== X-Gm-Message-State: AIVw111kdxLHoCwPmhSDk5F2GRgXAOl4U189spu8dkBwLzCLvO2FfmY0 4O0Fglm1gPkMDDDp X-Received: by 10.80.167.65 with SMTP id h59mr3202836edc.142.1499454539600; Fri, 07 Jul 2017 12:08:59 -0700 (PDT) Received: from uHalley.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id h58sm2614890edh.52.2017.07.07.12.08.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 07 Jul 2017 12:08:58 -0700 (PDT) From: "=?UTF-8?q?Javier=20Gonz=C3=A1lez?=" X-Google-Original-From: =?UTF-8?q?Javier=20Gonz=C3=A1lez?= To: mb@lightnvm.io, axboe@fb.com Cc: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Javier=20Gonz=C3=A1lez?= , =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 2/2] lightnvm: pblk: remove unnecessary checks Date: Fri, 7 Jul 2017 21:08:53 +0200 Message-Id: <1499454533-14907-3-git-send-email-javier@cnexlabs.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499454533-14907-1-git-send-email-javier@cnexlabs.com> References: <1499454533-14907-1-git-send-email-javier@cnexlabs.com> MIME-Version: 1.0 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 Remove unnecessary checks when freeing dma memory in the completion path. Signed-off-by: Javier González Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-write.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index cc2b9414d17c..3ad9e56d2473 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -39,9 +39,7 @@ static unsigned long pblk_end_w_bio(struct pblk *pblk, struct nvm_rq *rqd, ret = pblk_rb_sync_advance(&pblk->rwb, c_ctx->nr_valid); - if (rqd->meta_list) - nvm_dev_dma_free(dev->parent, rqd->meta_list, - rqd->dma_meta_list); + nvm_dev_dma_free(dev->parent, rqd->meta_list, rqd->dma_meta_list); bio_put(rqd->bio); pblk_free_rqd(pblk, rqd, WRITE); @@ -224,9 +222,6 @@ static int pblk_alloc_w_rq(struct pblk *pblk, struct nvm_rq *rqd, if (!rqd->meta_list) return -ENOMEM; - if (unlikely(nr_secs == 1)) - return 0; - rqd->ppa_list = rqd->meta_list + pblk_dma_meta_size; rqd->dma_ppa_list = rqd->dma_meta_list + pblk_dma_meta_size;