Commit 9ba6873e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'libnvdimm-fixes2-4.19-rc6' of...

Merge tag 'libnvdimm-fixes2-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm

Dan writes:
  "filesystem-dax for 4.19-rc6

   Fix a deadlock in the new for 4.19 dax_lock_mapping_entry() routine."

* tag 'libnvdimm-fixes2-4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm:
  dax: Fix deadlock in dax_lock_mapping_entry()
parents 291d0e5d f52afc93
...@@ -447,6 +447,7 @@ bool dax_lock_mapping_entry(struct page *page) ...@@ -447,6 +447,7 @@ bool dax_lock_mapping_entry(struct page *page)
xa_unlock_irq(&mapping->i_pages); xa_unlock_irq(&mapping->i_pages);
break; break;
} else if (IS_ERR(entry)) { } else if (IS_ERR(entry)) {
xa_unlock_irq(&mapping->i_pages);
WARN_ON_ONCE(PTR_ERR(entry) != -EAGAIN); WARN_ON_ONCE(PTR_ERR(entry) != -EAGAIN);
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment