From: Matthew Wilcox <willy@linux.intel.com>
Date: Tue, 8 Sep 2015 21:59:39 +0000 (-0700)
Subject: dax: use linear_page_index()
X-Git-Tag: v4.1.12-92~18^2^2~96
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd9682ac5bdb2aa34e7957cda71bb669a8c458ab;p=users%2Fjedix%2Flinux-maple.git

dax: use linear_page_index()

Orabug: 22913653

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

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 3fdd1b479dbc03347e98f904f54133a9cef5521f)
Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/fs/dax.c b/fs/dax.c
index b51b2124f30c..212040db7079 100644
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -542,7 +542,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;