summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorJan H. Schönherr <jschoenh@amazon.de>2018-01-31 16:14:04 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-26 11:02:14 +0200
commit710b5124aac67c4a48d29e32c2d9525278db405b (patch)
tree2bc7b16c27bf0e2555b0623c76877c89cadb7f31 /fs
parentcc0600dae30fe2ca2f3783599420a1b9bb88715d (diff)
downloadlinux-stable-710b5124aac67c4a48d29e32c2d9525278db405b.tar.gz
linux-stable-710b5124aac67c4a48d29e32c2d9525278db405b.tar.bz2
linux-stable-710b5124aac67c4a48d29e32c2d9525278db405b.zip
fs/dax.c: release PMD lock even when there is no PMD support in DAX
[ Upstream commit ee190ca6516bc8257e3d36187ca6f0f71a9ec477 ] follow_pte_pmd() can theoretically return after having acquired a PMD lock, even when DAX was not compiled with CONFIG_FS_DAX_PMD. Release the PMD lock unconditionally. Link: http://lkml.kernel.org/r/20180118133839.20587-1-jschoenh@amazon.de Fixes: f729c8c9b24f ("dax: wrprotect pmd_t in dax_mapping_entry_mkclean") Signed-off-by: Jan H. Schönherr <jschoenh@amazon.de> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Matthew Wilcox <mawilcox@microsoft.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/dax.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dax.c b/fs/dax.c
index 191306cd8b6b..ddb4981ae32e 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -630,8 +630,8 @@ static void dax_mapping_entry_mkclean(struct address_space *mapping,
set_pmd_at(vma->vm_mm, address, pmdp, pmd);
mmu_notifier_invalidate_range(vma->vm_mm, start, end);
unlock_pmd:
- spin_unlock(ptl);
#endif
+ spin_unlock(ptl);
} else {
if (pfn != pte_pfn(*ptep))
goto unlock_pte;