[GIT,PULL] dax fix for v5.3-rc3
diff mbox series

Message ID CAPcyv4hJcRY3aop4jgH8NLsz1A8HH7sH6gnGs02Wy8A=p5o=jg@mail.gmail.com
State New
Headers show
Series
  • [GIT,PULL] dax fix for v5.3-rc3
Related show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm dax-fix-5.3-rc3

Commit Message

Dan Williams July 30, 2019, 9:32 p.m. UTC
Hi Linus, please pull from:

  git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm dax-fix-5.3-rc3

...to receive a manual fixup I happened to drop. I re-fetched the
patch from the mailing list after integrating the git message-id
support to generate a "Link:" tag [1], but then did not re-apply the
fixup. This now matches what I tested and went into yesterday's -next.

[1]: https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2019-July/006608.html

---

The following changes since commit 609488bc979f99f805f34e9a32c1e3b71179d10b:

  Linux 5.3-rc2 (2019-07-28 12:47:02 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm dax-fix-5.3-rc3

for you to fetch changes up to 61c30c98ef17e5a330d7bb8494b78b3d6dffe9b8:

  dax: Fix missed wakeup in put_unlocked_entry() (2019-07-29 09:24:22 -0700)

----------------------------------------------------------------
dax fix 5.3-rc3

- Fix a botched manual patch update that got dropped between testing and
  application.

----------------------------------------------------------------
Jan Kara (1):
      dax: Fix missed wakeup in put_unlocked_entry()

 fs/dax.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

---

Comments

pr-tracker-bot@kernel.org July 31, 2019, 12:40 a.m. UTC | #1
The pull request you sent on Tue, 30 Jul 2019 14:32:42 -0700:

> git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm dax-fix-5.3-rc3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/4010b622f1d2a6112244101f38225eaee20c07f2

Thank you!

Patch
diff mbox series

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);
 }