Merge branch 'x86/cache' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 0 deletions

diff --git a/fs/dax.c b/fs/dax.c
index b68ce484e1be..4becbf168b7f 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -447,6 +447,7 @@ bool dax_lock_mapping_entry(struct page *page)
                         xa_unlock_irq(&mapping->i_pages);
                         break;
                 } else if (IS_ERR(entry)) {
+                        xa_unlock_irq(&mapping->i_pages);
                         WARN_ON_ONCE(PTR_ERR(entry) != -EAGAIN);
                         continue;
                 }