[PATCH] rmap : simplify the code for try_to_unmap_file

[PATCH] rmap : simplify the code for try_to_unmap_file

[Huang Shijie]

Just simplify the code when the mlocked is true.

Signed-off-by: Huang Shijie <shijie8@gmail.com>
---
 mm/rmap.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/mm/rmap.c b/mm/rmap.c
index dd43373..c57c3b6 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -1100,13 +1100,10 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
 		if (ret == SWAP_MLOCK) {
 			mlocked = try_to_mlock_page(page, vma);
 			if (mlocked)
-				break;  /* stop if actually mlocked page */
+				goto out;  /* stop if actually mlocked page */
 		}
 	}
 
-	if (mlocked)
-		goto out;
-
 	if (list_empty(&mapping->i_mmap_nonlinear))
 		goto out;
 
-- 
1.6.0.6

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] rmap : simplify the code for try_to_unmap_file

[KOSAKI Motohiro]

> Just simplify the code when the mlocked is true.
> 
> Signed-off-by: Huang Shijie <shijie8@gmail.com>
> ---
>  mm/rmap.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/mm/rmap.c b/mm/rmap.c
> index dd43373..c57c3b6 100644
> --- a/mm/rmap.c
> +++ b/mm/rmap.c
> @@ -1100,13 +1100,10 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
>  		if (ret == SWAP_MLOCK) {
>  			mlocked = try_to_mlock_page(page, vma);
>  			if (mlocked)
> -				break;  /* stop if actually mlocked page */
> +				goto out;  /* stop if actually mlocked page */
>  		}
>  	}
>  
> -	if (mlocked)
> -		goto out;
> -
>  	if (list_empty(&mapping->i_mmap_nonlinear))
>  		goto out;

Did anyone reviewed this patch?
Anyway,
	Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>


Huang, I'm sorry for the delaying. I was attend to JLS and I couldn't
review long time.



--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] rmap : simplify the code for try_to_unmap_file

[Huang Shijie]

KOSAKI Motohiro wrote:
>> Just simplify the code when the mlocked is true.
>>
>> Signed-off-by: Huang Shijie <shijie8@gmail.com>
>> ---
>>  mm/rmap.c |    5 +----
>>  1 files changed, 1 insertions(+), 4 deletions(-)
>>
>> diff --git a/mm/rmap.c b/mm/rmap.c
>> index dd43373..c57c3b6 100644
>> --- a/mm/rmap.c
>> +++ b/mm/rmap.c
>> @@ -1100,13 +1100,10 @@ static int try_to_unmap_file(struct page *page, enum ttu_flags flags)
>>  		if (ret == SWAP_MLOCK) {
>>  			mlocked = try_to_mlock_page(page, vma);
>>  			if (mlocked)
>> -				break;  /* stop if actually mlocked page */
>> +				goto out;  /* stop if actually mlocked page */
>>  		}
>>  	}
>>  
>> -	if (mlocked)
>> -		goto out;
>> -
>>  	if (list_empty(&mapping->i_mmap_nonlinear))
>>  		goto out;
>>     
>
> Did anyone reviewed this patch?
> Anyway,
> 	Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
>
>   
thanks :)
> Huang, I'm sorry for the delaying. I was attend to JLS and I couldn't
> review long time.
>
>
>   
Not at all.I forgeted the JLS when I sent the two tiny patchs.
>
>   

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>