All of lore.kernel.org
 help / color / mirror / Atom feed
From: Coly Li <colyli@suse.de>
To: linux-bcache@vger.kernel.org
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 <colyli@suse.de>
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	[thread overview]
Message-ID: <20210409164343.56828-17-colyli@suse.de> (raw)
In-Reply-To: <20210409164343.56828-1-colyli@suse.de>

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 <colyli@suse.de>
Cc: Jianpeng Ma <jianpeng.ma@intel.com>
Cc: Qiaowei Ren <qiaowei.ren@intel.com>
---
 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 <jianpeng.ma@intel.com>.
  */
 
+#ifdef CONFIG_BCACHE_NVM_PAGES
+
 #include "bcache.h"
 #include "nvm-pages.h"
 
@@ -23,8 +25,6 @@
 #include <linux/blkdev.h>
 #include <linux/bcache-nvm.h>
 
-#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 <linux/bcache-nvm.h>
 #include <linux/libnvdimm.h>
+#endif /* CONFIG_BCACHE_NVM_PAGES */
 
 /*
  * Bcache NVDIMM in memory data structures
-- 
2.26.2
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

WARNING: multiple messages have this Message-ID (diff)
From: Coly Li <colyli@suse.de>
To: linux-bcache@vger.kernel.org
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, dan.j.williams@intel.com,
	Coly Li <colyli@suse.de>
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	[thread overview]
Message-ID: <20210409164343.56828-17-colyli@suse.de> (raw)
In-Reply-To: <20210409164343.56828-1-colyli@suse.de>

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 <colyli@suse.de>
Cc: Jianpeng Ma <jianpeng.ma@intel.com>
Cc: Qiaowei Ren <qiaowei.ren@intel.com>
---
 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 <jianpeng.ma@intel.com>.
  */
 
+#ifdef CONFIG_BCACHE_NVM_PAGES
+
 #include "bcache.h"
 #include "nvm-pages.h"
 
@@ -23,8 +25,6 @@
 #include <linux/blkdev.h>
 #include <linux/bcache-nvm.h>
 
-#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 <linux/bcache-nvm.h>
 #include <linux/libnvdimm.h>
+#endif /* CONFIG_BCACHE_NVM_PAGES */
 
 /*
  * Bcache NVDIMM in memory data structures
-- 
2.26.2


  parent reply	other threads:[~2021-04-09 16:45 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-09 16:43 [PATCH v7 00/16] bcache: support NVDIMM for journaling Coly Li
2021-04-09 16:43 ` Coly Li
2021-04-09 16:43 ` [PATCH v7 01/16] bcache: add initial data structures for nvm pages Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 02/16] bcache: initialize the nvm pages allocator Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 03/16] bcache: initialization of the buddy Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 04/16] bcache: bch_nvm_alloc_pages() " Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 05/16] bcache: bch_nvm_free_pages() " Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 06/16] bcache: get allocated pages from specific owner Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 07/16] bcache: nvm-pages fixes for bcache integration testing Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 08/16] bcache: use bucket index to set GC_MARK_METADATA for journal buckets in bch_btree_gc_finish() Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 09/16] bcache: add BCH_FEATURE_INCOMPAT_NVDIMM_META into incompat feature set Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 10/16] bcache: initialize bcache journal for NVDIMM meta device Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 11/16] bcache: support storing bcache journal into " Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 12/16] bcache: read jset from NVDIMM pages for journal replay Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 13/16] bcache: add sysfs interface register_nvdimm_meta to register NVDIMM meta device Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 14/16] bcache: use div_u64() in init_owner_info() Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` [PATCH v7 15/16] bcache: fix BCACHE_NVM_PAGES' dependences in Kconfig Coly Li
2021-04-09 16:43   ` Coly Li
2021-04-09 16:43 ` Coly Li [this message]
2021-04-09 16:43   ` [PATCH v7 16/16] bcache: more fix for compiling error when BCACHE_NVM_PAGES disabled Coly Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210409164343.56828-17-colyli@suse.de \
    --to=colyli@suse.de \
    --cc=axboe@kernel.dk \
    --cc=hare@suse.com \
    --cc=jack@suse.cz \
    --cc=jianpeng.ma@intel.com \
    --cc=linux-bcache@vger.kernel.org \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-nvdimm@lists.01.org \
    --cc=qiaowei.ren@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.