diff options
author | David Sterba <dsterba@suse.cz> | 2014-06-14 20:55:29 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2014-12-12 12:07:23 -0500 |
commit | 23d79d81b13431756fee428acde49c9b770da132 (patch) | |
tree | 499546263a53fed6a5c5b9722fcbcb94f93068d9 /fs | |
parent | 7476dfdaade5b373db4679555706546bd5b4bd6c (diff) |
btrfs: use GFP_NOFS in __alloc_extent_buffer directly
Same mask from all callers.
Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/extent_io.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 4ebabd237153..619592d86c2a 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c | |||
@@ -4598,11 +4598,11 @@ static inline void btrfs_release_extent_buffer(struct extent_buffer *eb) | |||
4598 | 4598 | ||
4599 | static struct extent_buffer * | 4599 | static struct extent_buffer * |
4600 | __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start, | 4600 | __alloc_extent_buffer(struct btrfs_fs_info *fs_info, u64 start, |
4601 | unsigned long len, gfp_t mask) | 4601 | unsigned long len) |
4602 | { | 4602 | { |
4603 | struct extent_buffer *eb = NULL; | 4603 | struct extent_buffer *eb = NULL; |
4604 | 4604 | ||
4605 | eb = kmem_cache_zalloc(extent_buffer_cache, mask); | 4605 | eb = kmem_cache_zalloc(extent_buffer_cache, GFP_NOFS); |
4606 | if (eb == NULL) | 4606 | if (eb == NULL) |
4607 | return NULL; | 4607 | return NULL; |
4608 | eb->start = start; | 4608 | eb->start = start; |
@@ -4643,7 +4643,7 @@ struct extent_buffer *btrfs_clone_extent_buffer(struct extent_buffer *src) | |||
4643 | struct extent_buffer *new; | 4643 | struct extent_buffer *new; |
4644 | unsigned long num_pages = num_extent_pages(src->start, src->len); | 4644 | unsigned long num_pages = num_extent_pages(src->start, src->len); |
4645 | 4645 | ||
4646 | new = __alloc_extent_buffer(NULL, src->start, src->len, GFP_NOFS); | 4646 | new = __alloc_extent_buffer(NULL, src->start, src->len); |
4647 | if (new == NULL) | 4647 | if (new == NULL) |
4648 | return NULL; | 4648 | return NULL; |
4649 | 4649 | ||
@@ -4672,7 +4672,7 @@ struct extent_buffer *alloc_dummy_extent_buffer(u64 start, unsigned long len) | |||
4672 | unsigned long num_pages = num_extent_pages(0, len); | 4672 | unsigned long num_pages = num_extent_pages(0, len); |
4673 | unsigned long i; | 4673 | unsigned long i; |
4674 | 4674 | ||
4675 | eb = __alloc_extent_buffer(NULL, start, len, GFP_NOFS); | 4675 | eb = __alloc_extent_buffer(NULL, start, len); |
4676 | if (!eb) | 4676 | if (!eb) |
4677 | return NULL; | 4677 | return NULL; |
4678 | 4678 | ||
@@ -4824,7 +4824,7 @@ struct extent_buffer *alloc_extent_buffer(struct btrfs_fs_info *fs_info, | |||
4824 | if (eb) | 4824 | if (eb) |
4825 | return eb; | 4825 | return eb; |
4826 | 4826 | ||
4827 | eb = __alloc_extent_buffer(fs_info, start, len, GFP_NOFS); | 4827 | eb = __alloc_extent_buffer(fs_info, start, len); |
4828 | if (!eb) | 4828 | if (!eb) |
4829 | return NULL; | 4829 | return NULL; |
4830 | 4830 | ||