This series reverts some recent changes to the locking scheme in DAX introduced by these two commits: commit 843172978bb9 ("dax: fix race between simultaneous faults") commit 46c043ede471 ("mm: take i_mmap_lock in unmap_mapping_range() for DAX") Changes from v3: - reduced the revert of 46c043ede471 in patch 1 so that we still drop the mapping->i_mmap_rwsem before calling unmap_mapping_range(). This prevents the deadlock in the __dax_pmd_fault() path so there is no longer a need to temporarily disable DAX PMD faults. Ross Zwisler (2): Revert "mm: take i_mmap_lock in unmap_mapping_range() for DAX" Revert "dax: fix race between simultaneous faults" fs/dax.c | 70 +++++++++++++++++++++++++------------------------------------ mm/memory.c | 2 ++ 2 files changed, 31 insertions(+), 41 deletions(-) -- 2.1.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxx. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@xxxxxxxxx"> email@xxxxxxxxx </a>