From fd6f4ffb277f3018cd243a68cd88c19732151f8a Mon Sep 17 00:00:00 2001 From: Edward Tomasz Napierala Date: Tue, 27 Jul 2010 19:26:18 +0000 Subject: [PATCH] Fix commented out resource limit check in mlockall(2). It's still racy, but at least less misleading. --- sys/vm/vm_mmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 3d72123cadd..999a48118ff 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -1082,8 +1082,7 @@ mlockall(td, uap) * a hard resource limit, return ENOMEM. */ PROC_LOCK(td->td_proc); - if (map->size - ptoa(pmap_wired_count(vm_map_pmap(map)) > - lim_cur(td->td_proc, RLIMIT_MEMLOCK))) { + if (map->size > lim_cur(td->td_proc, RLIMIT_MEMLOCK)) { PROC_UNLOCK(td->td_proc); return (ENOMEM); }