Skip to content

Commit

Permalink
dax: Fix missed wakeup in put_unlocked_entry()
Browse files Browse the repository at this point in the history
The condition checking whether put_unlocked_entry() needs to wake up
following waiter got broken by commit 23c84eb ("dax: Fix missed
wakeup with PMD faults"). We need to wake the waiter whenever the passed
entry is valid (i.e., non-NULL and not special conflict entry). This
could lead to processes never being woken up when waiting for entry
lock. Fix the condition.

Cc: <[email protected]>
Link: http://lore.kernel.org/r/[email protected]
Fixes: 23c84eb ("dax: Fix missed wakeup with PMD faults")
Signed-off-by: Jan Kara <[email protected]>
Signed-off-by: Dan Williams <[email protected]>
  • Loading branch information
jankara authored and djbw committed Jul 29, 2019
1 parent 609488b commit 61c30c9
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/dax.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 61c30c9

Please sign in to comment.