Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f101ada7 authored by Wei Yang's avatar Wei Yang Committed by Dan Williams
Browse files

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: ae86cbfe "libnvdimm, pfn: Pad pfn namespaces relative to other regions"
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarWei Yang <richardw.yang@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent f17b5f06

drivers/nvdimm/pfn_devs.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}