diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-26 08:26:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-26 08:26:58 -0700 |
| commit | 019793b7554b18818624e9cf7a2ee8ba8cf6bda0 (patch) | |
| tree | ffe6ea833b4310d063a4a40435ba8877c396a303 /fs/btrfs/extent_io.c | |
| parent | cb49f577879519d1bff5898d9eec72dd441286cb (diff) | |
| parent | 7cf96da3ec7ca225acf4f284b0e904a1f5f98821 (diff) | |
| download | kernel_samsung_smdk4412-019793b7554b18818624e9cf7a2ee8ba8cf6bda0.zip kernel_samsung_smdk4412-019793b7554b18818624e9cf7a2ee8ba8cf6bda0.tar.gz kernel_samsung_smdk4412-019793b7554b18818624e9cf7a2ee8ba8cf6bda0.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: cleanup error handling in inode.c
Btrfs: put the right bio if we have an error
Btrfs: free bitmaps properly when evicting the cache
Btrfs: Free free_space item properly in btrfs_trim_block_group()
btrfs: add missing spin_unlock to a rare exit path
Btrfs: check return value of kmalloc()
btrfs: fix wrong allocating flag when reading page
Btrfs: fix missing mutex_unlock in btrfs_del_dir_entries_in_log()
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 3151386..ba41da5 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); } |