diff options
| author | David Sterba <dsterba@suse.cz> | 2011-04-21 01:12:06 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2011-05-02 13:57:22 +0200 |
| commit | ba14419264684b290f0d0b7f48d26eafb11fc0c6 (patch) | |
| tree | 0620d8dac3cfaa34383ac88ab19293e89a256997 /fs/btrfs/extent_io.c | |
| parent | f09d1f60e6aa82fb4cfaa525e21f6287fc1516f4 (diff) | |
| download | kernel_samsung_smdk4412-ba14419264684b290f0d0b7f48d26eafb11fc0c6.zip kernel_samsung_smdk4412-ba14419264684b290f0d0b7f48d26eafb11fc0c6.tar.gz kernel_samsung_smdk4412-ba14419264684b290f0d0b7f48d26eafb11fc0c6.tar.bz2 | |
btrfs: drop gfp parameter from alloc_extent_buffer
pass GFP_NOFS directly to kmem_cache_alloc
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index ad0f0a9..9369289 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -3266,8 +3266,7 @@ static inline void btrfs_release_extent_buffer(struct extent_buffer *eb) struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, u64 start, unsigned long len, - struct page *page0, - gfp_t mask) + struct page *page0) { unsigned long num_pages = num_extent_pages(start, len); unsigned long i; @@ -3288,7 +3287,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, } rcu_read_unlock(); - eb = __alloc_extent_buffer(tree, start, len, mask); + eb = __alloc_extent_buffer(tree, start, len, GFP_NOFS); if (!eb) return NULL; @@ -3305,7 +3304,7 @@ struct extent_buffer *alloc_extent_buffer(struct extent_io_tree *tree, i = 0; } for (; i < num_pages; i++, index++) { - p = find_or_create_page(mapping, index, mask | __GFP_HIGHMEM); + p = find_or_create_page(mapping, index, GFP_NOFS | __GFP_HIGHMEM); if (!p) { WARN_ON(1); goto free_eb; |