Re: [LTP] [PATCH] memcg_function:fix the wrong use of mlock

[Caspar Zhang <caspar@casparzhang.com>]

On 12/15/2011 10:46 AM, Peng Haitao wrote:
> 
> mlock and munmap will return -1 when ERROR.
> 
> Signed-off-by: Peng Haitao <penght@cn.fujitsu.com>

Nice catch.

Reviewed-by: Caspar Zhang <caspar@casparzhang.com>

> ---
>  .../cpuset/cpuset_memory_test/cpuset_memory_test.c |    4 ++--
>  .../controllers/memcg/functional/memcg_process.c   |    6 +++---
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> 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
> index 4f8c257..37ded19 100644
> --- a/testcases/kernel/controllers/memcg/functional/memcg_process.c
> +++ b/testcases/kernel/controllers/memcg/functional/memcg_process.c
> @@ -167,7 +167,7 @@ void mmap_file()
>  		}
>  		touch_memory(p, memsize);
>  	} else {
> -		if (!munmap(p, memsize) == -1)
> +		if (munmap(p, memsize) == -1)
>  			err(1, "munmap(file) failed");
>  
>  		if (opt_hugepage) {
> @@ -202,10 +202,10 @@ void mmap_lock2()
>  		if (p == MAP_FAILED)
>  			err(1, "mmap failed");
>  
> -		if (!mlock(p, memsize))
> +		if (mlock(p, memsize) == -1)
>  			err(1, "mlock failed");
>  	} else {
> -		if (!munmap(p, memsize) == -1)
> +		if (munmap(p, memsize) == -1)
>  			err(1, "munmap failed");
>  	}
>  }


------------------------------------------------------------------------------
10 Tips for Better Server Consolidation
Server virtualization is being driven by many needs.  
But none more important than the need to reduce IT complexity 
while improving strategic productivity.  Learn More! 
http://www.accelacomm.com/jaw/sdnl/114/51507609/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list