tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'dax-fix-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Pull dax fix from Dan Williams:
"Fix a performance regression that followed from a fix to the
conversion of the fsdax implementation to the xarray. v5.3 users
report that they stop seeing huge page mappings on an application +
filesystem layout that was seeing huge pages previously on v5.2"

* tag 'dax-fix-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
fs/dax: Fix pmd vs pte conflict detection

Linus Torvalds 485fc4b6 1c4e395c

+3 -2
+3 -2
fs/dax.c
··· 220 220 221 221 for (;;) { 222 222 entry = xas_find_conflict(xas); 223 + if (!entry || WARN_ON_ONCE(!xa_is_value(entry))) 224 + return entry; 223 225 if (dax_entry_order(entry) < order) 224 226 return XA_RETRY_ENTRY; 225 - if (!entry || WARN_ON_ONCE(!xa_is_value(entry)) || 226 - !dax_is_locked(entry)) 227 + if (!dax_is_locked(entry)) 227 228 return entry; 228 229 229 230 wq = dax_entry_waitqueue(xas, entry, &ewait.key);