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

gregkh · gregkh · commit 9ba6873e1603 · 2018-09-30T06:19:38.000-07:00
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()
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -447,6 +447,7 @@ bool dax_lock_mapping_entry(struct page *page)`
`447`	`447`	`xa_unlock_irq(&mapping->i_pages);`
`448`	`448`	`break;`
`449`	`449`	`} else if (IS_ERR(entry)) {`
	`450`	`+ xa_unlock_irq(&mapping->i_pages);`
`450`	`451`	`WARN_ON_ONCE(PTR_ERR(entry) != -EAGAIN);`
`451`	`452`	`continue;`
`452`	`453`	`}`