This commit was manufactured by cvs2svn to create tag

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

diff --git a/mm/mlock.c b/mm/mlock.c
index 0cf446b..b896132 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -32,10 +32,13 @@ static int mlock_fixup(struct vm_area_struct * vma,
                        goto out;
                }
        }
-       
-       spin_lock(&mm->page_table_lock);
+
+       /*
+        * vm_flags is protected by the mmap_sem held in write mode.
+        * It's okay if try_to_unmap_one unmaps a page just after we
+        * set VM_LOCKED, make_pages_present below will bring it back.
+        */
        vma->vm_flags = newflags;
-       spin_unlock(&mm->page_table_lock);
 
        /*
         * Keep track of amount of locked VM.
@@ -100,7 +103,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
 
 asmlinkage long sys_mlock(unsigned long start, size_t len)
 {
-       unsigned long locked;
+       unsigned long locked, grow;
        unsigned long lock_limit;
        int error = -ENOMEM;
 
@@ -108,8 +111,10 @@ asmlinkage long sys_mlock(unsigned long start, size_t len)
        len = PAGE_ALIGN(len + (start & ~PAGE_MASK));
        start &= PAGE_MASK;
 
-       locked = len >> PAGE_SHIFT;
-       locked += current->mm->locked_vm;
+       grow = len >> PAGE_SHIFT;
+       if (!vx_vmlocked_avail(current->mm, grow))
+               goto out;
+       locked = current->mm->locked_vm + grow;
 
        lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
        lock_limit >>= PAGE_SHIFT;
@@ -117,6 +122,7 @@ asmlinkage long sys_mlock(unsigned long start, size_t len)
        /* check against resource limits */
        if (locked <= lock_limit)
                error = do_mlock(start, len, 1);
+out:
        up_write(&current->mm->mmap_sem);
        return error;
 }
@@ -174,6 +180,9 @@ asmlinkage long sys_mlockall(int flags)
        lock_limit >>= PAGE_SHIFT;
 
        ret = -ENOMEM;
+       if (!vx_vmlocked_avail(current->mm, current->mm->total_vm))
+               goto out;
+       /* check vserver lock limits? */
        if (current->mm->total_vm <= lock_limit)
                ret = do_mlockall(flags);
 out: