Merge tag 'dax-fix-5.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm (cde357c3) · Commits · 戴 / test

Pull dax fix from Dan Williams: "A single dax fix that has been soaking awaiting other fixes under discussion to join it. As it is getting late in the cycle lets proceed with this fix and save follow-on changes for post-v5.3-rc1. - Fix xarray entry association for mixed mappings" * tag 'dax-fix-5.2-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: Fix xarray entry association for mixed mappings

fs/dax.c

+4 −5

Original line number	Diff line number	Diff line
		@@ -720,12 +720,11 @@ static void dax_insert_entry(struct xa_state xas,

		xas_reset(xas);
		xas_lock_irq(xas);
		if (dax_entry_size(entry) != dax_entry_size(new_entry)) {
		if (dax_is_zero_entry(entry) \|\| dax_is_empty_entry(entry)) {
		void *old;

		dax_disassociate_entry(entry, mapping, false);
		dax_associate_entry(new_entry, mapping, vmf->vma, vmf->address);
		}

		if (dax_is_zero_entry(entry) \|\| dax_is_empty_entry(entry)) {
		/*
		* Only swap our new entry into the page cache if the current
		* entry is a zero page or an empty entry. If a normal PTE or
		@@ -734,7 +733,7 @@ static void dax_insert_entry(struct xa_state xas,
		* existing entry is a PMD, we will just leave the PMD in the
		* tree and dirty it if necessary.
		*/
		void *old = dax_lock_entry(xas, new_entry);
		old = dax_lock_entry(xas, new_entry);
		WARN_ON_ONCE(old != xa_mk_value(xa_to_value(entry) \|
		DAX_LOCKED));
		entry = new_entry;

Admin message