Commit 3fdd1b47 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Linus Torvalds
Browse files

dax: use linear_page_index() 



I was basically open-coding it (thanks to copying code from do_fault()
which probably also needs to be fixed).

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 73a6ec47

fs/dax.c

+1 −1
Original line number Diff line number Diff line
@@ -529,7 +529,7 @@ int __dax_pmd_fault(struct vm_area_struct *vma, unsigned long address, 
	if ((pmd_addr + PMD_SIZE) > vma->vm_end)

		return VM_FAULT_FALLBACK;



	pgoff = ((pmd_addr - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;

	pgoff = linear_page_index(vma, pmd_addr);

	size = (i_size_read(inode) + PAGE_SIZE - 1) >> PAGE_SHIFT;

	if (pgoff >= size)

		return VM_FAULT_SIGBUS;