diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 07:36:21 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 07:36:21 +0200 |
| commit | 134c428e5a31f2d5ed3a70ba20dac83895ec8b82 (patch) | |
| tree | 0fb28accbf09171b8a1ca792361f4160434529e8 /fs/btrfs/extent_io.c | |
| parent | powerpc: Add early debug for WSP platforms (diff) | |
| parent | powerpc/4xx: Fix regression in SMP on 476 (diff) | |
| download | linux-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.tar.xz linux-134c428e5a31f2d5ed3a70ba20dac83895ec8b82.zip | |
Merge remote branch 'benh/merge' into benh-next
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 315138605088..ba41da59e31b 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -2681,7 +2681,7 @@ int extent_readpages(struct extent_io_tree *tree, prefetchw(&page->flags); list_del(&page->lru); if (!add_to_page_cache_lru(page, mapping, - page->index, GFP_KERNEL)) { + page->index, GFP_NOFS)) { __extent_read_full_page(tree, page, get_extent, &bio, 0, &bio_flags); } |