diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2019-01-26 19:27:57 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2019-02-22 20:52:32 +0100 |
| commit | 4960461f5d22bb6d2965592c01805a97d55b132f (patch) | |
| tree | 68f472319d82ae1b58c5d7d9dd6c00a5899f4d69 /drivers/nvdimm/pfn_devs.c | |
| parent | dax: Check the end of the block-device capacity with dax_direct_access() (diff) | |
| download | linux-4960461f5d22bb6d2965592c01805a97d55b132f.tar.xz linux-4960461f5d22bb6d2965592c01805a97d55b132f.zip | |
libnvdimm/pfn: Remove dax_label_reserve
The reserve was for an abandoned effort to add label (partitioning
support) to device-dax instances. Remove it.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/pfn_devs.c')
| -rw-r--r-- | drivers/nvdimm/pfn_devs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c index ba74a341da5d..d271bd731af7 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c @@ -690,7 +690,6 @@ static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trun static int nd_pfn_init(struct nd_pfn *nd_pfn) { - u32 dax_label_reserve = is_nd_dax(&nd_pfn->dev) ? SZ_128K : 0; struct nd_namespace_common *ndns = nd_pfn->ndns; struct nd_namespace_io *nsio = to_nd_namespace_io(&ndns->dev); u32 start_pad, end_trunc, reserve = info_block_reserve(); @@ -748,11 +747,10 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) * when populating the vmemmap. This *should* be equal to * PMD_SIZE for most architectures. */ - offset = ALIGN(start + reserve + 64 * npfns + dax_label_reserve, + offset = ALIGN(start + reserve + 64 * npfns, max(nd_pfn->align, PMD_SIZE)) - start; } else if (nd_pfn->mode == PFN_MODE_RAM) - offset = ALIGN(start + reserve + dax_label_reserve, - nd_pfn->align) - start; + offset = ALIGN(start + reserve, nd_pfn->align) - start; else return -ENXIO; |