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 fb3a1cf..8c893a0 100644 (file)
--- a/mm/mlock.c
+++ b/mm/mlock.c
@@ -8,8 +8,6 @@
 #include <linux/mman.h>
 #include <linux/mm.h>
 #include <linux/vs_memory.h>
-#include <linux/syscalls.h>
-#include <linux/vs_memory.h>
 
 
 static int mlock_fixup(struct vm_area_struct * vma, 
@@ -122,7 +120,7 @@ asmlinkage long sys_mlock(unsigned long start, size_t len)
                goto out;
        locked = current->mm->locked_vm + grow;
 
-       lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+       lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
        lock_limit >>= PAGE_SHIFT;
 
        /* check against resource limits */
@@ -184,7 +182,7 @@ asmlinkage long sys_mlockall(int flags)
 
        down_write(&current->mm->mmap_sem);
 
-       lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+       lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
        lock_limit >>= PAGE_SHIFT;
 
        ret = -ENOMEM;
@@ -219,10 +217,10 @@ int user_shm_lock(size_t size, struct user_struct *user)
        unsigned long lock_limit, locked;
        int allowed = 0;
 
-       locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
-       lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
-       lock_limit >>= PAGE_SHIFT;
        spin_lock(&shmlock_user_lock);
+       locked = size >> PAGE_SHIFT;
+       lock_limit = current->rlim[RLIMIT_MEMLOCK].rlim_cur;
+       lock_limit >>= PAGE_SHIFT;
        if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
                goto out;
        get_uid(user);
@@ -236,7 +234,7 @@ out:
 void user_shm_unlock(size_t size, struct user_struct *user)
 {
        spin_lock(&shmlock_user_lock);
-       user->locked_shm -= (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+       user->locked_shm -= (size >> PAGE_SHIFT);
        spin_unlock(&shmlock_user_lock);
        free_uid(user);
 }