summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds2019-07-31 02:32:46 +0200
committerLinus Torvalds2019-07-31 02:32:46 +0200
commit4010b622f1d2a6112244101f38225eaee20c07f2 (patch)
treedf7b40a9c4a1647187834acd2ec0830dd0ea373b /fs
parentMerge tag 'for-linus-20190730' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
parentdax: Fix missed wakeup in put_unlocked_entry() (diff)
downloadkernel-qcow2-linux-4010b622f1d2a6112244101f38225eaee20c07f2.tar.gz
kernel-qcow2-linux-4010b622f1d2a6112244101f38225eaee20c07f2.tar.xz
kernel-qcow2-linux-4010b622f1d2a6112244101f38225eaee20c07f2.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dax.c b/fs/dax.c
index a237141d8787..b64964ef44f6 100644
--- a/fs/dax.c
+++ b/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);
}