From: Cyril H. <su...@li...> - 2011-12-21 14:11:23
|
The branch, master, has been updated via 17a0258436f77611bf3e2455a08c800aa911db27 (commit) via f67911d0cc32e65734115e930ffa5b7001aa9ccb (commit) from 04c9398977a261ffca56f61196439a6af4e8922c (commit) - Log ----------------------------------------------------------------- commit 17a0258436f77611bf3e2455a08c800aa911db27 Author: Peng Haitao <pe...@cn...> Date: Thu Dec 15 10:46:13 2011 +0800 controllers: fix the wrong use of mlock and munmap mlock and munmap will return -1 when ERROR. Signed-off-by: Peng Haitao <pe...@cn...> Reviewed-by: Caspar Zhang <ca...@ca...> Reviewed-by: Wanlong Gao <gao...@cn...> commit f67911d0cc32e65734115e930ffa5b7001aa9ccb Author: Cyril Hrubis <ch...@su...> Date: Wed Dec 21 15:06:43 2011 +0100 Revert "mlock and munmap will return -1 if they fail." This reverts commit 17ecdc4e0f895f61067a65d6105f29d4f55680be. The patch was applied only partly. Fixed version comes right away. ----------------------------------------------------------------------- Summary of changes: .../cpuset/cpuset_memory_test/cpuset_memory_test.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 testcases/kernel/controllers/memcg/functional/memcg_process.c diff --git a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_test.c b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_test.c index 8d37b24..512df3a 100644 --- a/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_test.c +++ b/testcases/kernel/controllers/cpuset/cpuset_memory_test/cpuset_memory_test.c @@ -196,7 +196,7 @@ void mmap_file(int flag_allocated) } touch_memory_and_echo_node(p, memsize); } else { - if (!munmap(p, memsize) == -1) + if (munmap(p, memsize) == -1) err(1, "munmap(file) failed"); if (opt_hugepage) { @@ -236,7 +236,7 @@ void mmap_lock2(int flag_allocated) err(1, "mlock failed"); touch_memory_and_echo_node(p, memsize); } else { - if (!munmap(p, memsize) == -1) + if (munmap(p, memsize) == -1) err(1, "munmap failed"); } } diff --git a/testcases/kernel/controllers/memcg/functional/memcg_process.c b/testcases/kernel/controllers/memcg/functional/memcg_process.c old mode 100755 new mode 100644 hooks/post-receive -- ltp |