From patchwork Fri Apr 9 16:43:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Coly Li X-Patchwork-Id: 12194535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 248A6C433ED for ; Fri, 9 Apr 2021 16:45:54 +0000 (UTC) Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E20FA610A7 for ; Fri, 9 Apr 2021 16:45:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E20FA610A7 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvdimm-bounces@lists.01.org Received: from ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id CF65F100EA903; Fri, 9 Apr 2021 09:45:53 -0700 (PDT) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=195.135.220.15; helo=mx2.suse.de; envelope-from=colyli@suse.de; receiver= Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5D621100EAB1F for ; Fri, 9 Apr 2021 09:45:51 -0700 (PDT) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id E91D4B120; Fri, 9 Apr 2021 16:45:49 +0000 (UTC) From: Coly Li To: linux-bcache@vger.kernel.org Subject: [PATCH v7 16/16] bcache: more fix for compiling error when BCACHE_NVM_PAGES disabled Date: Sat, 10 Apr 2021 00:43:43 +0800 Message-Id: <20210409164343.56828-17-colyli@suse.de> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210409164343.56828-1-colyli@suse.de> References: <20210409164343.56828-1-colyli@suse.de> MIME-Version: 1.0 Message-ID-Hash: NNQGJUVCISBNWUM2BOSH6X3HSNKO5ZWU X-Message-ID-Hash: NNQGJUVCISBNWUM2BOSH6X3HSNKO5ZWU X-MailFrom: colyli@suse.de X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header CC: linux-block@vger.kernel.org, linux-nvdimm@lists.01.org, axboe@kernel.dk, jianpeng.ma@intel.com, qiaowei.ren@intel.com, hare@suse.com, jack@suse.cz, Coly Li X-Mailman-Version: 3.1.1 Precedence: list List-Id: "Linux-nvdimm developer list." Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: This patch fixes the compiling error when BCACHE_NVM_PAGES is disabled. The change could be added into previous nvm-pages patches, so that this patch can be dropped in next nvm-pages series. Signed-off-by: Coly Li Cc: Jianpeng Ma Cc: Qiaowei Ren --- drivers/md/bcache/nvm-pages.c | 4 ++-- drivers/md/bcache/nvm-pages.h | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/md/bcache/nvm-pages.c b/drivers/md/bcache/nvm-pages.c index 19597ae7ef3e..b32f162bf728 100644 --- a/drivers/md/bcache/nvm-pages.c +++ b/drivers/md/bcache/nvm-pages.c @@ -7,6 +7,8 @@ * Copyright (c) 2021, Jianpeng Ma . */ +#ifdef CONFIG_BCACHE_NVM_PAGES + #include "bcache.h" #include "nvm-pages.h" @@ -23,8 +25,6 @@ #include #include -#ifdef CONFIG_BCACHE_NVM_PAGES - struct bch_nvm_set *only_set; static void release_nvm_namespaces(struct bch_nvm_set *nvm_set) diff --git a/drivers/md/bcache/nvm-pages.h b/drivers/md/bcache/nvm-pages.h index 1c4cbad0209f..f9e0cd7ca3dd 100644 --- a/drivers/md/bcache/nvm-pages.h +++ b/drivers/md/bcache/nvm-pages.h @@ -3,8 +3,10 @@ #ifndef _BCACHE_NVM_PAGES_H #define _BCACHE_NVM_PAGES_H +#ifdef CONFIG_BCACHE_NVM_PAGES #include #include +#endif /* CONFIG_BCACHE_NVM_PAGES */ /* * Bcache NVDIMM in memory data structures