diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-30 17:32:46 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-30 17:32:46 -0700 |
commit | 4010b622f1d2a6112244101f38225eaee20c07f2 (patch) | |
tree | df7b40a9c4a1647187834acd2ec0830dd0ea373b /fs | |
parent | 629f8205a6cc63d2e8e30956bad958a3507d018f (diff) | |
parent | 61c30c98ef17e5a330d7bb8494b78b3d6dffe9b8 (diff) |
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()
Diffstat (limited to 'fs')
-rw-r--r-- | fs/dax.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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); } |