From patchwork Thu Jul 7 07:54:18 2016 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: 9218057 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 84C396048B for ; Thu, 7 Jul 2016 07:56:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A8E92878F for ; Thu, 7 Jul 2016 07:56:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F43328791; Thu, 7 Jul 2016 07:56:54 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 1E9E62878F for ; Thu, 7 Jul 2016 07:56:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756247AbcGGH4k (ORCPT ); Thu, 7 Jul 2016 03:56:40 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:36359 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756638AbcGGHys (ORCPT ); Thu, 7 Jul 2016 03:54:48 -0400 Received: by mail-wm0-f67.google.com with SMTP id i4so3078148wmg.3 for ; Thu, 07 Jul 2016 00:54:47 -0700 (PDT) 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=1ZW00aSJR4TYpF2Y5gYDlLPt/PeNc6Kaw2ik/M7nbyY=; b=E2e3WWSQA/ukjvXJq63nr289XA/J93sWr5pe4LZspqdSn4D/Gz+UlfY+F2dXqaT7QR cfyjBQ7n1iGxuy2+vzppZMjDNB4+Mi0JrduMiFMZ07vd9qILGTxBHEUaaHd8SchXCfA0 RfAqpYuOGpjlrx1iDrLpODphbnJV5RtbBSrfM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=1ZW00aSJR4TYpF2Y5gYDlLPt/PeNc6Kaw2ik/M7nbyY=; b=fy/1zd5LDv6yzq/qXFAx5fDKJKCMMNcIBvSJX9iGcKZuxVHTAyr6Iw4VsOUINMYf3B lKjxD3y00uFs82mQL5V31bacnKv1cJKiFiGqlg5LqI5tu3bBLMFAoG1gDNEv51SE9q/2 Q0pvwcwn/KqT1Z/wYidwhABku1cBA/pPDuk1c+svMGIBWOjYhA8YdoFEnDT+s0SbQ6AK awemVBnVTTluJDv7JU1xo+vBLgHlQW7yek/A04rxFO9HLBa6W8kTtgjcVdzKu4oFp8VQ w72DbjIZXbDS2rc/yITVcUcw8VZLi8e9CTisUbkoxVwav5Li6BoFkcTZUobzcKqCeAIa x3Gg== X-Gm-Message-State: ALyK8tLAQagVzvqcxyloZPLujWAVXN5KK5zg/91TqejzJn7mpyG0MrVRqve4ltTVzW24Hw== X-Received: by 10.28.66.204 with SMTP id k73mr24444740wmi.20.1467878087069; Thu, 07 Jul 2016 00:54:47 -0700 (PDT) Received: from Macroninja.cnexlabs.com (6164211-cl69.boa.fiberby.dk. [193.106.164.211]) by smtp.gmail.com with ESMTPSA id i74sm1654796wmg.21.2016.07.07.00.54.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 00:54:46 -0700 (PDT) From: =?UTF-8?q?Matias=20Bj=C3=B8rling?= To: linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, axboe@fb.com Cc: =?UTF-8?q?Matias=20Bj=C3=B8rling?= Subject: [PATCH 12/17] lightnvm: remove unused lists from struct rrpc_block Date: Thu, 7 Jul 2016 09:54:18 +0200 Message-Id: <1467878063-22919-13-git-send-email-m@bjorling.me> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1467878063-22919-1-git-send-email-m@bjorling.me> References: <1467878063-22919-1-git-send-email-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 The ->list, ->open_list, and ->closed_list lists were previously used for statistics. However, their usage have been removed, and thus these can safely be removed. Signed-off-by: Matias Bjørling --- drivers/lightnvm/rrpc.c | 9 --------- drivers/lightnvm/rrpc.h | 8 -------- 2 files changed, 17 deletions(-) diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c index c3a6f34..10ed22b 100644 --- a/drivers/lightnvm/rrpc.c +++ b/drivers/lightnvm/rrpc.c @@ -205,7 +205,6 @@ static struct rrpc_block *rrpc_get_blk(struct rrpc *rrpc, struct rrpc_lun *rlun, } rblk = rrpc_get_rblk(rlun, blk->id); - list_add_tail(&rblk->list, &rlun->open_list); spin_unlock(&lun->lock); blk->priv = rblk; @@ -224,7 +223,6 @@ static void rrpc_put_blk(struct rrpc *rrpc, struct rrpc_block *rblk) spin_lock(&lun->lock); nvm_put_blk_unlocked(rrpc->dev, rblk->parent); - list_del(&rblk->list); spin_unlock(&lun->lock); } @@ -511,16 +509,11 @@ static void rrpc_gc_queue(struct work_struct *work) struct rrpc *rrpc = gcb->rrpc; struct rrpc_block *rblk = gcb->rblk; struct rrpc_lun *rlun = rblk->rlun; - struct nvm_lun *lun = rblk->parent->lun; spin_lock(&rlun->lock); list_add_tail(&rblk->prio, &rlun->prio_list); spin_unlock(&rlun->lock); - spin_lock(&lun->lock); - list_move_tail(&rblk->list, &rlun->closed_list); - spin_unlock(&lun->lock); - mempool_free(gcb, rrpc->gcb_pool); pr_debug("nvm: block '%lu' is full, allow GC (sched)\n", rblk->parent->id); @@ -1194,8 +1187,6 @@ static int rrpc_luns_init(struct rrpc *rrpc, int lun_begin, int lun_end) rlun->rrpc = rrpc; INIT_LIST_HEAD(&rlun->prio_list); - INIT_LIST_HEAD(&rlun->open_list); - INIT_LIST_HEAD(&rlun->closed_list); INIT_WORK(&rlun->ws_gc, rrpc_lun_gc); spin_lock_init(&rlun->lock); diff --git a/drivers/lightnvm/rrpc.h b/drivers/lightnvm/rrpc.h index 5797343..448e39a 100644 --- a/drivers/lightnvm/rrpc.h +++ b/drivers/lightnvm/rrpc.h @@ -56,7 +56,6 @@ struct rrpc_block { struct nvm_block *parent; struct rrpc_lun *rlun; struct list_head prio; - struct list_head list; #define MAX_INVALID_PAGES_STORAGE 8 /* Bitmap for invalid page intries */ @@ -77,13 +76,6 @@ struct rrpc_lun { struct rrpc_block *blocks; /* Reference to block allocation */ struct list_head prio_list; /* Blocks that may be GC'ed */ - struct list_head open_list; /* In-use open blocks. These are blocks - * that can be both written to and read - * from - */ - struct list_head closed_list; /* In-use closed blocks. These are - * blocks that can _only_ be read from - */ struct work_struct ws_gc;