From patchwork Wed Dec 20 17:21:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Matias_Bj=C3=B8rling?= X-Patchwork-Id: 10126079 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 CEF9A60245 for ; Wed, 20 Dec 2017 17:29:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8E602873F for ; Wed, 20 Dec 2017 17:29:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC85929204; Wed, 20 Dec 2017 17:29:14 +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.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 5A8A52873F for ; Wed, 20 Dec 2017 17:29:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755945AbdLTRWW (ORCPT ); Wed, 20 Dec 2017 12:22:22 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:40072 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755918AbdLTRWR (ORCPT ); Wed, 20 Dec 2017 12:22:17 -0500 Received: by mail-wm0-f67.google.com with SMTP id f206so11104173wmf.5 for ; Wed, 20 Dec 2017 09:22:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bjorling.me; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5yqgUKWpiOUJIqj+RlXbv7AxgB7DQo1WOu1idmCl8TI=; b=oYuh6Z4uQ2UPnFKF9zlWF8yPAYOeUYnkeu7vx1uyGoCbXA0t9XtgdfY/d7fvq3045P 9XJKFnJQT7d3Ca2RrLyLIJLnBtB7xDvSsRInD4t2LzeD8M79kZV6/laq6r3VoYUzsWq1 Kj+YMWm44mWB7Tlf2k5XdvKHcO4GehNcsGywU= 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=5yqgUKWpiOUJIqj+RlXbv7AxgB7DQo1WOu1idmCl8TI=; b=dRcdFDCZo+yc9zOe9Aj82xrs2+uVnO7ZJl+T1NAHW/+wnnDYruJur6SmX2ZeZgs4c0 X2WzTSbndPDsoj90P4eKvFu/VSap0Eul6939WdX2ItLr3gRWA1LkXgvXNpPX/C3KM2uT aalf0EyNmesu97svUo2HXiKYFknyKApVsdE6UQ/dVCEVsxPdhnTDULgrzQ/zngFJkMpL RMyvtMwxTRTmjulGWzaubzRn30ltTb5P7QmT8g3cpMn5rfE7Yk+z8qjOhbToG2Vf33Wo lPgocRc2fmwHRVeyTGg02QsV9Smu6DMIqwhguc7gvDOY9ML/QEj2OGdkOudJzbTnm5jP pjlw== X-Gm-Message-State: AKGB3mLqReKanOrhasLbUSkQrhWty84ZsffGa19sLrWGaEpZXvRX1Fpk oFQ6d/zyQ3ShbYZXdH3V3cFH6AKl X-Google-Smtp-Source: ACJfBosZXv3gK3Zrv5fRQBwL7LcYMsPlf5sOPOnP4ub108eshHFrROL3DMI9xGuLIlJr36BurBzz7Q== X-Received: by 10.80.152.6 with SMTP id g6mr6343513edb.28.1513790536028; Wed, 20 Dec 2017 09:22:16 -0800 (PST) Received: from skyninja.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id 26sm15339120eds.67.2017.12.20.09.22.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:22:15 -0800 (PST) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 03/25] lightnvm: use internal pblk methods Date: Wed, 20 Dec 2017 18:21:43 +0100 Message-Id: <20171220172205.26464-4-m@bjorling.me> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20171220172205.26464-1-m@bjorling.me> References: <20171220172205.26464-1-m@bjorling.me> 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 Now that rrpc has been removed, the only users of the ppa helpers is pblk. However, pblk already defines similar functions. Switch pblk to use the internal ones, and remove the generic ppa helpers. Signed-off-by: Matias Bjørling --- drivers/lightnvm/pblk-map.c | 2 +- drivers/lightnvm/pblk-write.c | 4 ++-- include/linux/lightnvm.h | 19 ------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/drivers/lightnvm/pblk-map.c b/drivers/lightnvm/pblk-map.c index 6f3ecde..7445e64 100644 --- a/drivers/lightnvm/pblk-map.c +++ b/drivers/lightnvm/pblk-map.c @@ -146,7 +146,7 @@ void pblk_map_erase_rq(struct pblk *pblk, struct nvm_rq *rqd, return; /* Erase blocks that are bad in this line but might not be in next */ - if (unlikely(ppa_empty(*erase_ppa)) && + if (unlikely(pblk_ppa_empty(*erase_ppa)) && bitmap_weight(d_line->blk_bitmap, lm->blk_per_line)) { int bit = -1; diff --git a/drivers/lightnvm/pblk-write.c b/drivers/lightnvm/pblk-write.c index 6c1cafa..6c30b7a 100644 --- a/drivers/lightnvm/pblk-write.c +++ b/drivers/lightnvm/pblk-write.c @@ -439,7 +439,7 @@ static int pblk_submit_io_set(struct pblk *pblk, struct nvm_rq *rqd) struct pblk_line *meta_line; int err; - ppa_set_empty(&erase_ppa); + pblk_ppa_set_empty(&erase_ppa); /* Assign lbas to ppas and populate request structure */ err = pblk_setup_w_rq(pblk, rqd, &erase_ppa); @@ -457,7 +457,7 @@ static int pblk_submit_io_set(struct pblk *pblk, struct nvm_rq *rqd) return NVM_IO_ERR; } - if (!ppa_empty(erase_ppa)) { + if (!pblk_ppa_empty(erase_ppa)) { /* Submit erase for next data line */ if (pblk_blk_erase_async(pblk, erase_ppa)) { struct pblk_line *e_line = pblk_line_get_erase(pblk); diff --git a/include/linux/lightnvm.h b/include/linux/lightnvm.h index b7f111f..c506e5d 100644 --- a/include/linux/lightnvm.h +++ b/include/linux/lightnvm.h @@ -417,25 +417,6 @@ static inline struct ppa_addr dev_to_generic_addr(struct nvm_tgt_dev *tgt_dev, return l; } -static inline int ppa_empty(struct ppa_addr ppa_addr) -{ - return (ppa_addr.ppa == ADDR_EMPTY); -} - -static inline void ppa_set_empty(struct ppa_addr *ppa_addr) -{ - ppa_addr->ppa = ADDR_EMPTY; -} - -static inline int ppa_cmp_blk(struct ppa_addr ppa1, struct ppa_addr ppa2) -{ - if (ppa_empty(ppa1) || ppa_empty(ppa2)) - return 0; - - return ((ppa1.g.ch == ppa2.g.ch) && (ppa1.g.lun == ppa2.g.lun) && - (ppa1.g.blk == ppa2.g.blk)); -} - typedef blk_qc_t (nvm_tgt_make_rq_fn)(struct request_queue *, struct bio *); typedef sector_t (nvm_tgt_capacity_fn)(void *); typedef void *(nvm_tgt_init_fn)(struct nvm_tgt_dev *, struct gendisk *,