diff options
| author | Adam Litke <agl@us.ibm.com> | 2006-09-29 10:58:43 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 18:18:03 +0200 |
| commit | 79f5acf5d784492afe80723496624093079aed9c (patch) | |
| tree | 64933a842722dbd8923680a9aafa4c334d1b06d5 /mm/filemap.c | |
| parent | [PATCH] mm: fix a race condition under SMC + COW (diff) | |
| download | linux-79f5acf5d784492afe80723496624093079aed9c.tar.xz linux-79f5acf5d784492afe80723496624093079aed9c.zip | |
[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>
Diffstat (limited to 'mm/filemap.c')
| -rw-r--r-- | mm/filemap.c | 6 |
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: * accessible.. */ if (area->vm_mm == current->mm) - return NULL; + return NOPAGE_SIGBUS; /* Fall through to the non-read-ahead case */ no_cached_page: /* @@ -1496,7 +1496,7 @@ no_cached_page: */ if (error == -ENOMEM) return NOPAGE_OOM; - return NULL; + return NOPAGE_SIGBUS; page_not_uptodate: if (!did_readaround) { @@ -1565,7 +1565,7 @@ page_not_uptodate: */ shrink_readahead_size_eio(file, ra); page_cache_release(page); - return NULL; + return NOPAGE_SIGBUS; } EXPORT_SYMBOL(filemap_nopage); |