libnvdimm, pmem: move definition of nvdimm_namespace_add_poison to nd.h

Orabug: 22913653

nd-core.h is private to the libnvdimm core internals and should not be
used by drivers.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
(cherry picked from commit ad9a8bde2cb19f6876f964fc48acc8b6a2f325ff)
Signed-off-by: Dan Duval <dan.duval@oracle.com>

diff --git a/drivers/nvdimm/nd-core.h b/drivers/nvdimm/nd-core.h
index 74a922f0576067c0ffc79d65ff9c1e0f6784521a..1d1500f3d8b51b557ffc7295e356a8f138cef0ac 100644 (file)
--- a/drivers/nvdimm/nd-core.h
+++ b/drivers/nvdimm/nd-core.h
@@ -91,6 +91,4 @@ bool __nd_attach_ndns(struct device *dev, struct nd_namespace_common *attach,
 ssize_t nd_namespace_store(struct device *dev,
                struct nd_namespace_common **_ndns, const char *buf,
                size_t len);
-int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset,
-               struct nd_namespace_common *ndns);
 #endif /* __ND_CORE_H__ */

diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index 44be9db886e993dbaed089cfb379bf448454eeae..2081fda468fd52f92b5dd68bd3be773fcc7890b8 100644 (file)
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -262,6 +262,8 @@ int nvdimm_namespace_attach_btt(struct nd_namespace_common *ndns);
 int nvdimm_namespace_detach_btt(struct nd_namespace_common *ndns);
 const char *nvdimm_namespace_disk_name(struct nd_namespace_common *ndns,
                char *name);
+int nvdimm_namespace_add_poison(struct gendisk *disk, resource_size_t offset,
+               struct nd_namespace_common *ndns);
 int nd_blk_region_init(struct nd_region *nd_region);
 void __nd_iostat_start(struct bio *bio, unsigned long *start);
 static inline bool nd_iostat_start(struct bio *bio, unsigned long *start)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 51be3dbeaac6fddbd3ffee8f9b57bd8a8b242e8a..d0ecebef5db2371304b003a3128aaa42c371767d 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -27,7 +27,6 @@
 #include <linux/slab.h>
 #include <linux/pmem.h>
 #include <linux/nd.h>
-#include "nd-core.h"
 #include "pfn.h"
 #include "nd.h"