Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm

1 files changed, 8 insertions, 0 deletions

diff --git a/drivers/nvdimm/nd.h b/drivers/nvdimm/nd.h
index e4e9f9ae0cc8..ba1633b9da31 100644
--- a/drivers/nvdimm/nd.h
+++ b/drivers/nvdimm/nd.h
@@ -31,6 +31,12 @@ enum {
         INT_LBASIZE_ALIGNMENT = 64,
 };
 
+struct nd_poison {
+        u64 start;
+        u64 length;
+        struct list_head list;
+};
+
 struct nvdimm_drvdata {
         struct device *dev;
         int nsindex_size;
@@ -256,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);
+void nvdimm_namespace_add_poison(struct nd_namespace_common *ndns,
+                struct badblocks *bb, resource_size_t offset);
 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)