From: Eric Mei <eric.mei@oracle.com>
Date: Wed, 5 May 2010 01:14:34 +0000 (-0600)
Subject: b=22669 fix fault page index handler in newer kernel.
X-Git-Tag: 1.10.0.42~16
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=af028abaaa2d14db767a09f0c3f1427be2889689;p=fs%2Flustre-release.git

b=22669 fix fault page index handler in newer kernel.

r=wangdi
r=rread
---

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 30fa9bf..31ccf8c 100644
--- a/lustre/llite/llite_mmap.c
+++ b/lustre/llite/llite_mmap.c
@@ -153,7 +153,7 @@ int ll_fault_io_init(struct vm_area_struct *vma, struct lu_env **env_ret,
         LASSERT(io->ci_obj != NULL);
 
         fio = &io->u.ci_fault;
-        fio->ft_index      = vma->vm_pgoff + index;
+        fio->ft_index      = index;
         fio->ft_writable   = (vma->vm_flags&writable) == writable;
         fio->ft_executable = vma->vm_flags&VM_EXEC;
 
@@ -213,7 +213,7 @@ struct page *ll_nopage(struct vm_area_struct *vma, unsigned long address,
         int                     result;
         ENTRY;
 
-        pg_offset = (address - vma->vm_start) >> PAGE_SHIFT;
+        pg_offset = ((address - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;
         result = ll_fault_io_init(vma, &env,  &nest, pg_offset, &ra_flags);
         if (env == NULL)
                 return NOPAGE_SIGBUS;