This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / mm / fremap.c

diff --git a/mm/fremap.c b/mm/fremap.c
index 2c8abe6..6c38dc8 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -36,9 +36,10 @@ static inline void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
                        if (!PageReserved(page)) {
                                if (pte_dirty(pte))
                                        set_page_dirty(page);
-                               page_remove_rmap(page, ptep);
+                               page_remove_rmap(page);
                                page_cache_release(page);
-                               mm->rss--;
+                               // mm->rss--;
+                               vx_rsspages_dec(mm);
                        }
                }
        } else {
@@ -49,7 +50,7 @@ static inline void zap_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 }
 
 /*
- * Install a page to a given virtual memory address, release any
+ * Install a file page to a given virtual memory address, release any
  * previously existing mapping.
  */
 int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
@@ -60,14 +61,13 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
        pgd_t *pgd;
        pmd_t *pmd;
        pte_t pte_val;
-       struct pte_chain *pte_chain;
 
-       pte_chain = pte_chain_alloc(GFP_KERNEL);
-       if (!pte_chain)
-               goto err;
        pgd = pgd_offset(mm, addr);
        spin_lock(&mm->page_table_lock);
 
+       if (!vx_rsspages_avail(mm, 1))
+               goto err_unlock;
+
        pmd = pmd_alloc(mm, pgd, addr);
        if (!pmd)
                goto err_unlock;
@@ -78,21 +78,18 @@ int install_page(struct mm_struct *mm, struct vm_area_struct *vma,
 
        zap_pte(mm, vma, addr, pte);
 
-       mm->rss++;
+       // mm->rss++;
+       vx_rsspages_inc(mm);
        flush_icache_page(vma, page);
        set_pte(pte, mk_pte(page, prot));
-       pte_chain = page_add_rmap(page, pte, pte_chain);
+       page_add_file_rmap(page);
        pte_val = *pte;
        pte_unmap(pte);
        update_mmu_cache(vma, addr, pte_val);
-       spin_unlock(&mm->page_table_lock);
-       pte_chain_free(pte_chain);
-       return 0;
 
+       err = 0;
 err_unlock:
        spin_unlock(&mm->page_table_lock);
-       pte_chain_free(pte_chain);
-err:
        return err;
 }
 EXPORT_SYMBOL(install_page);
@@ -159,6 +156,7 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
        unsigned long __prot, unsigned long pgoff, unsigned long flags)
 {
        struct mm_struct *mm = current->mm;
+       struct address_space *mapping;
        unsigned long end = start + size;
        struct vm_area_struct *vma;
        int err = -EINVAL;
@@ -188,16 +186,30 @@ asmlinkage long sys_remap_file_pages(unsigned long start, unsigned long size,
        /*
         * Make sure the vma is shared, that it supports prefaulting,
         * and that the remapped range is valid and fully within
-        * the single existing vma:
+        * the single existing vma.  vm_private_data is used as a
+        * swapout cursor in a VM_NONLINEAR vma (unless VM_RESERVED
+        * or VM_LOCKED, but VM_LOCKED could be revoked later on).
         */
        if (vma && (vma->vm_flags & VM_SHARED) &&
+               (!vma->vm_private_data || (vma->vm_flags & VM_RESERVED)) &&
                vma->vm_ops && vma->vm_ops->populate &&
                        end > start && start >= vma->vm_start &&
                                end <= vma->vm_end) {
 
                /* Must set VM_NONLINEAR before any pages are populated. */
-               if (pgoff != ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff)
+               if (pgoff != linear_page_index(vma, start) &&
+                   !(vma->vm_flags & VM_NONLINEAR)) {
+                       mapping = vma->vm_file->f_mapping;
+                       spin_lock(&mapping->i_mmap_lock);
+                       flush_dcache_mmap_lock(mapping);
                        vma->vm_flags |= VM_NONLINEAR;
+                       vma_prio_tree_remove(vma, &mapping->i_mmap);
+                       vma_prio_tree_init(vma);
+                       list_add_tail(&vma->shared.vm_set.list,
+                                       &mapping->i_mmap_nonlinear);
+                       flush_dcache_mmap_unlock(mapping);
+                       spin_unlock(&mapping->i_mmap_lock);
+               }
 
                /* ->populate can take a long time, so downgrade the lock. */
                downgrade_write(&mm->mmap_sem);