Skip to contentSkip to conversation

mm: Make filemap_nopage use NOPAGE_SIGBUS

PATCH New Adam Litke 1 participant 1 message Sep 18, 2006

Subsystems (2)
Memory management Page cache
lore
Share & tools
lore

Adam Litke

author
#0 lore raw

PATCH 1/1 mm: Make filemap_nopage use NOPAGE_SIGBUS

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 <[email protected]>
 filemap.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
mm/filemap.c +3 -3
diff -upN 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);
Signature · 2 lines
Adam Litke - (agl at us.ibm.com)
IBM Linux Technology Center