Skip to content

Commit 4010b62

Browse files
committed
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()
2 parents 629f820 + 61c30c9 commit 4010b62

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

fs/dax.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static void wait_entry_unlocked(struct xa_state *xas, void *entry)
266266
static void put_unlocked_entry(struct xa_state *xas, void *entry)
267267
{
268268
/* If we were the only waiter woken, wake the next one */
269-
if (entry && dax_is_conflict(entry))
269+
if (entry && !dax_is_conflict(entry))
270270
dax_wake_entry(xas, entry, false);
271271
}
272272

0 commit comments

Comments
 (0)