aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Litke <agl@us.ibm.com>2006-09-29 04:58:43 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-29 12:18:03 -0400
commit79f5acf5d784492afe80723496624093079aed9c (patch)
tree64933a842722dbd8923680a9aafa4c334d1b06d5
parent4ce072f1faf29d24df4600f53db8cdd62d400a8f (diff)
[PATCH] mm: make filemap_nopage use NOPAGE_SIGBUS
Don't open-code NOPAGE_SIGBUS. Signed-off-by: Adam Litke <agl@us.ibm.com> Acked-by: Hugh Dickins <hugh@veritas.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--mm/filemap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/filemap.c b/mm/filemap.c
index afcdc72b5e90..3277f3b23524 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -1471,7 +1471,7 @@ outside_data_content:
1471 * accessible.. 1471 * accessible..
1472 */ 1472 */
1473 if (area->vm_mm == current->mm) 1473 if (area->vm_mm == current->mm)
1474 return NULL; 1474 return NOPAGE_SIGBUS;
1475 /* Fall through to the non-read-ahead case */ 1475 /* Fall through to the non-read-ahead case */
1476no_cached_page: 1476no_cached_page:
1477 /* 1477 /*
@@ -1496,7 +1496,7 @@ no_cached_page:
1496 */ 1496 */
1497 if (error == -ENOMEM) 1497 if (error == -ENOMEM)
1498 return NOPAGE_OOM; 1498 return NOPAGE_OOM;
1499 return NULL; 1499 return NOPAGE_SIGBUS;
1500 1500
1501page_not_uptodate: 1501page_not_uptodate:
1502 if (!did_readaround) { 1502 if (!did_readaround) {
@@ -1565,7 +1565,7 @@ page_not_uptodate:
1565 */ 1565 */
1566 shrink_readahead_size_eio(file, ra); 1566 shrink_readahead_size_eio(file, ra);
1567 page_cache_release(page); 1567 page_cache_release(page);
1568 return NULL; 1568 return NOPAGE_SIGBUS;
1569} 1569}
1570EXPORT_SYMBOL(filemap_nopage); 1570EXPORT_SYMBOL(filemap_nopage);
1571 1571