libnvdimm, btt: cache sector_size in arena_info

In preparation for the error clearing rework, add sector_size in the
arena_info struct.

Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/btt.c b/drivers/nvdimm/btt.c
index 15d1b071746bba9fac0138699753c13a1ecaca8f..9c96530ea6d59e1e7f254b92be7733df064547f3 100644 (file)
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@ -566,6 +566,7 @@ static struct arena_info *alloc_arena(struct btt *btt, size_t size,
        if (!arena)
                return NULL;
        arena->nd_btt = btt->nd_btt;
+       arena->sector_size = btt->sector_size;
 
        if (!size)
                return arena;

diff --git a/drivers/nvdimm/btt.h b/drivers/nvdimm/btt.h
index 09fabf5a5590eb7bb6e9531addd54df49c9a18c7..2bc0d10b8438f0482bdd0241d697bb17c802d020 100644 (file)
--- a/drivers/nvdimm/btt.h
+++ b/drivers/nvdimm/btt.h
@@ -108,6 +108,7 @@ struct aligned_lock {
  *                     handle incoming writes.
  * @version_major:     Metadata layout version major.
  * @version_minor:     Metadata layout version minor.
+ * @sector_size:       The Linux sector size - 512 or 4096
  * @nextoff:           Offset in bytes to the start of the next arena.
  * @infooff:           Offset in bytes to the info block of this arena.
  * @dataoff:           Offset in bytes to the data area of this arena.
@@ -135,6 +136,7 @@ struct arena_info {
        u32 nfree;
        u16 version_major;
        u16 version_minor;
+       u32 sector_size;
        /* Byte offsets to the different on-media structures */
        u64 nextoff;
        u64 infooff;