Commit 79f5acf5 authored by Adam Litke's avatar Adam Litke Committed by Linus Torvalds

[PATCH] mm: make filemap_nopage use NOPAGE_SIGBUS

Don't open-code NOPAGE_SIGBUS.
Signed-off-by: default avatarAdam Litke <agl@us.ibm.com>
Acked-by: default avatarHugh Dickins <hugh@veritas.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4ce072f1
...@@ -1471,7 +1471,7 @@ struct page *filemap_nopage(struct vm_area_struct *area, ...@@ -1471,7 +1471,7 @@ struct page *filemap_nopage(struct vm_area_struct *area,
* accessible.. * accessible..
*/ */
if (area->vm_mm == current->mm) if (area->vm_mm == current->mm)
return NULL; return NOPAGE_SIGBUS;
/* Fall through to the non-read-ahead case */ /* Fall through to the non-read-ahead case */
no_cached_page: no_cached_page:
/* /*
...@@ -1496,7 +1496,7 @@ struct page *filemap_nopage(struct vm_area_struct *area, ...@@ -1496,7 +1496,7 @@ struct page *filemap_nopage(struct vm_area_struct *area,
*/ */
if (error == -ENOMEM) if (error == -ENOMEM)
return NOPAGE_OOM; return NOPAGE_OOM;
return NULL; return NOPAGE_SIGBUS;
page_not_uptodate: page_not_uptodate:
if (!did_readaround) { if (!did_readaround) {
...@@ -1565,7 +1565,7 @@ struct page *filemap_nopage(struct vm_area_struct *area, ...@@ -1565,7 +1565,7 @@ struct page *filemap_nopage(struct vm_area_struct *area,
*/ */
shrink_readahead_size_eio(file, ra); shrink_readahead_size_eio(file, ra);
page_cache_release(page); page_cache_release(page);
return NULL; return NOPAGE_SIGBUS;
} }
EXPORT_SYMBOL(filemap_nopage); EXPORT_SYMBOL(filemap_nopage);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment