libnvdimm, pfn: Fix over-trim in trim_pfn_device()

When trying to see whether current nd_region intersects with others,
trim_pfn_device() has already calculated the *size* to be expanded to
SECTION size.

Do not double append 'adjust' to 'size' when calculating whether the end
of a region collides with the next pmem region.

Fixes: ae86cbfef381 "libnvdimm, pfn: Pad pfn namespaces relative to other regions"
Cc: <stable@vger.kernel.org>
Signed-off-by: Wei Yang <richardw.yang@linux.intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c
index 6f22272e8d8014d9ccf3a7e480ea42c2c3b8b2ba..040bbd9c367e7a9bb369cb17af8ecab96106362b 100644 (file)
--- a/drivers/nvdimm/pfn_devs.c
+++ b/drivers/nvdimm/pfn_devs.c
@@ -678,7 +678,7 @@ static void trim_pfn_device(struct nd_pfn *nd_pfn, u32 *start_pad, u32 *end_trun
        if (region_intersects(start, size, IORESOURCE_SYSTEM_RAM,
                                IORES_DESC_NONE) == REGION_MIXED
                        || !IS_ALIGNED(end, nd_pfn->align)
-                       || nd_region_conflict(nd_region, start, size + adjust))
+                       || nd_region_conflict(nd_region, start, size))
                *end_trunc = end - phys_pmem_align_down(nd_pfn, end);
 }