mirror of
https://github.com/torvalds/linux.git
synced 2024-11-26 14:12:06 +00:00
Merge branch 'dax-fix-5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
Pull dax fix from Dan Williams: "Fix a botched manual patch update that got dropped between testing and application" * 'dax-fix-5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm: dax: Fix missed wakeup in put_unlocked_entry()
This commit is contained in:
commit
4010b622f1
2
fs/dax.c
2
fs/dax.c
@ -266,7 +266,7 @@ static void wait_entry_unlocked(struct xa_state *xas, void *entry)
|
||||
static void put_unlocked_entry(struct xa_state *xas, void *entry)
|
||||
{
|
||||
/* If we were the only waiter woken, wake the next one */
|
||||
if (entry && dax_is_conflict(entry))
|
||||
if (entry && !dax_is_conflict(entry))
|
||||
dax_wake_entry(xas, entry, false);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user