b=22458 consolidate fs_db flags.

[fs/lustre-release.git] / lustre / llite / llite_mmap.c

diff --git a/lustre/llite/llite_mmap.c b/lustre/llite/llite_mmap.c
index 740eeb4..31ccf8c 100644 (file)
--- 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;
@@ -311,8 +311,8 @@ static void ll_vm_open(struct vm_area_struct * vma)
 
         ENTRY;
         LASSERT(vma->vm_file);
-        LASSERT(atomic_read(&vob->cob_mmap_cnt) >= 0);
-        atomic_inc(&vob->cob_mmap_cnt);
+        LASSERT(cfs_atomic_read(&vob->cob_mmap_cnt) >= 0);
+        cfs_atomic_inc(&vob->cob_mmap_cnt);
         EXIT;
 }
 
@@ -326,8 +326,8 @@ static void ll_vm_close(struct vm_area_struct *vma)
 
         ENTRY;
         LASSERT(vma->vm_file);
-        atomic_dec(&vob->cob_mmap_cnt);
-        LASSERT(atomic_read(&vob->cob_mmap_cnt) >= 0);
+        cfs_atomic_dec(&vob->cob_mmap_cnt);
+        LASSERT(cfs_atomic_read(&vob->cob_mmap_cnt) >= 0);
         EXIT;
 }