patch-2.6.6-vs1.9.0

[linux-2.6.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index f73d2c4..c10a7d9 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -327,7 +327,8 @@ void put_dirty_page(struct task_struct *tsk, struct page *page,
        set_pte(pte, pte_mkdirty(pte_mkwrite(mk_pte(page, prot))));
        pte_chain = page_add_rmap(page, pte, pte_chain);
        pte_unmap(pte);
-       tsk->mm->rss++;
+       // tsk->mm->rss++;
+       vx_rsspages_inc(tsk->mm);
        spin_unlock(&tsk->mm->page_table_lock);
 
        /* no need for flush_tlb */
@@ -409,7 +410,8 @@ int setup_arg_pages(struct linux_binprm *bprm, int executable_stack)
        if (!mpnt)
                return -ENOMEM;
 
-       if (security_vm_enough_memory(arg_size >> PAGE_SHIFT)) {
+       if (security_vm_enough_memory(arg_size >> PAGE_SHIFT) ||
+               !vx_vmpages_avail(mm, arg_size >> PAGE_SHIFT)) {
                kmem_cache_free(vm_area_cachep, mpnt);
                return -ENOMEM;
        }
@@ -441,7 +443,9 @@ int setup_arg_pages(struct linux_binprm *bprm, int executable_stack)
                INIT_LIST_HEAD(&mpnt->shared);
                mpnt->vm_private_data = (void *) 0;
                insert_vm_struct(mm, mpnt);
-               mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+               // mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
+               vx_vmpages_sub(mm, mm->total_vm -
+                       ((mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT));
        }
 
        for (i = 0 ; i < MAX_ARG_PAGES ; i++) {