linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [TRIVIAL PATCH] mm: Make filemap_nopage use NOPAGE_SIGBUS
@ 2006-09-28 19:09 Adam Litke
  2006-09-28 19:14 ` Hugh Dickins
  0 siblings, 1 reply; 3+ messages in thread
From: Adam Litke @ 2006-09-28 19:09 UTC (permalink / raw)
  To: akpm; +Cc: ADAM G. LITKE [imap], linux-mm, linux-kernel, hugh

Hi Andrew.  This is just a "nice to have" cleanup patch.  Any chance on
getting it merged (lest I forget about it again)?  Thanks.

While reading trough filemap_nopage() I found the 'return NULL'
statements a bit confusing since we already have two constants defined
for ->nopage error conditions.  Since a NULL return value really means
NOPAGE_SIGBUS, just return that to make the code more readable.

Signed-off-by: Adam Litke <agl@us.ibm.com> 

 filemap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff -upN reference/mm/filemap.c current/mm/filemap.c
--- reference/mm/filemap.c
+++ current/mm/filemap.c
@@ -1454,7 +1454,7 @@ outside_data_content:
 	 * accessible..
 	 */
 	if (area->vm_mm == current->mm)
-		return NULL;
+		return NOPAGE_SIGBUS;
 	/* Fall through to the non-read-ahead case */
 no_cached_page:
 	/*
@@ -1479,7 +1479,7 @@ no_cached_page:
 	 */
 	if (error == -ENOMEM)
 		return NOPAGE_OOM;
-	return NULL;
+	return NOPAGE_SIGBUS;
 
 page_not_uptodate:
 	if (!did_readaround) {
@@ -1548,7 +1548,7 @@ page_not_uptodate:
 	 */
 	shrink_readahead_size_eio(file, ra);
 	page_cache_release(page);
-	return NULL;
+	return NOPAGE_SIGBUS;
 }
 EXPORT_SYMBOL(filemap_nopage);
 
-- 
Adam Litke - (agl at us.ibm.com)
IBM Linux Technology Center

--
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>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [TRIVIAL PATCH] mm: Make filemap_nopage use NOPAGE_SIGBUS
  2006-09-28 19:09 [TRIVIAL PATCH] mm: Make filemap_nopage use NOPAGE_SIGBUS Adam Litke
@ 2006-09-28 19:14 ` Hugh Dickins
  0 siblings, 0 replies; 3+ messages in thread
From: Hugh Dickins @ 2006-09-28 19:14 UTC (permalink / raw)
  To: Adam Litke; +Cc: akpm, linux-mm, linux-kernel

On Thu, 28 Sep 2006, Adam Litke wrote:
> Hi Andrew.  This is just a "nice to have" cleanup patch.  Any chance on
> getting it merged (lest I forget about it again)?  Thanks.
> 
> While reading trough filemap_nopage() I found the 'return NULL'
> statements a bit confusing since we already have two constants defined
> for ->nopage error conditions.  Since a NULL return value really means
> NOPAGE_SIGBUS, just return that to make the code more readable.
> 
> Signed-off-by: Adam Litke <agl@us.ibm.com> 

That's long confused and irritated me, gladly
Acked-by: Hugh Dickins <hugh@veritas.com>

> 
>  filemap.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> diff -upN reference/mm/filemap.c current/mm/filemap.c
> --- reference/mm/filemap.c
> +++ current/mm/filemap.c
> @@ -1454,7 +1454,7 @@ outside_data_content:
>  	 * accessible..
>  	 */
>  	if (area->vm_mm == current->mm)
> -		return NULL;
> +		return NOPAGE_SIGBUS;
>  	/* Fall through to the non-read-ahead case */
>  no_cached_page:
>  	/*
> @@ -1479,7 +1479,7 @@ no_cached_page:
>  	 */
>  	if (error == -ENOMEM)
>  		return NOPAGE_OOM;
> -	return NULL;
> +	return NOPAGE_SIGBUS;
>  
>  page_not_uptodate:
>  	if (!did_readaround) {
> @@ -1548,7 +1548,7 @@ page_not_uptodate:
>  	 */
>  	shrink_readahead_size_eio(file, ra);
>  	page_cache_release(page);
> -	return NULL;
> +	return NOPAGE_SIGBUS;
>  }
>  EXPORT_SYMBOL(filemap_nopage);
>  
> -- 
> Adam Litke - (agl at us.ibm.com)
> IBM Linux Technology Center
> 

--
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>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [TRIVIAL PATCH] mm: Make filemap_nopage use NOPAGE_SIGBUS
@ 2006-09-18 15:32 Adam Litke
  0 siblings, 0 replies; 3+ messages in thread
From: Adam Litke @ 2006-09-18 15:32 UTC (permalink / raw)
  To: trivial; +Cc: ADAM G. LITKE [imap], linux-mm, linux-kernel

While reading trough filemap_nopage() I found the 'return NULL'
statements a bit confusing since we already have two constants defined
for ->nopage error conditions.  Since a NULL return value really means
NOPAGE_SIGBUS, just return that to make the code more readable.

Signed-off-by: Adam Litke <agl@us.ibm.com> 

 filemap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff -upN reference/mm/filemap.c current/mm/filemap.c
--- reference/mm/filemap.c
+++ current/mm/filemap.c
@@ -1454,7 +1454,7 @@ outside_data_content:
 	 * accessible..
 	 */
 	if (area->vm_mm == current->mm)
-		return NULL;
+		return NOPAGE_SIGBUS;
 	/* Fall through to the non-read-ahead case */
 no_cached_page:
 	/*
@@ -1479,7 +1479,7 @@ no_cached_page:
 	 */
 	if (error == -ENOMEM)
 		return NOPAGE_OOM;
-	return NULL;
+	return NOPAGE_SIGBUS;
 
 page_not_uptodate:
 	if (!did_readaround) {
@@ -1548,7 +1548,7 @@ page_not_uptodate:
 	 */
 	shrink_readahead_size_eio(file, ra);
 	page_cache_release(page);
-	return NULL;
+	return NOPAGE_SIGBUS;
 }
 EXPORT_SYMBOL(filemap_nopage);
 
-- 
Adam Litke - (agl at us.ibm.com)
IBM Linux Technology Center

--
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>

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2006-09-28 19:14 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-09-28 19:09 [TRIVIAL PATCH] mm: Make filemap_nopage use NOPAGE_SIGBUS Adam Litke
2006-09-28 19:14 ` Hugh Dickins
  -- strict thread matches above, loose matches on Subject: below --
2006-09-18 15:32 Adam Litke

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox