From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 12 May 2021 19:57:53 +0000 (-0700)
Subject: Merge branch 'for-5.13/dax' into libnvdimm-fixes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=de80d578113605164c358e4b532db2be5b71b1a7;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-5.13/dax' into libnvdimm-fixes

Pull in the dax wake fix for linux-next testing in the libnvdimm-fixes
branch.
---

de80d578113605164c358e4b532db2be5b71b1a7
diff --cc fs/dax.c
index 69216241392f,df5485b4bddf..62352cbcf0f4
--- a/fs/dax.c
+++ b/fs/dax.c
@@@ -524,8 -535,8 +535,8 @@@ retry
  
  		dax_disassociate_entry(entry, mapping, false);
  		xas_store(xas, NULL);	/* undo the PMD join */
- 		dax_wake_entry(xas, entry, true);
+ 		dax_wake_entry(xas, entry, WAKE_ALL);
 -		mapping->nrexceptional--;
 +		mapping->nrpages -= PG_PMD_NR;
  		entry = NULL;
  		xas_set(xas, index);
  	}
@@@ -661,10 -672,10 +672,10 @@@ static int __dax_invalidate_entry(struc
  		goto out;
  	dax_disassociate_entry(entry, mapping, trunc);
  	xas_store(&xas, NULL);
 -	mapping->nrexceptional--;
 +	mapping->nrpages -= 1UL << dax_entry_order(entry);
  	ret = 1;
  out:
- 	put_unlocked_entry(&xas, entry);
+ 	put_unlocked_entry(&xas, entry, WAKE_ALL);
  	xas_unlock_irq(&xas);
  	return ret;
  }