aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2011-04-20 18:48:27 -0400
committerDavid Sterba <dsterba@suse.cz>2011-05-02 07:57:21 -0400
commit172ddd60a662c4d8bf2809462866ddddd6431ea5 (patch)
treefc3c82d8e20a10f77fd26de64a58c416b80b42ac /fs/btrfs/inode.c
parenta8067e022ab54fde8953880a64572c3acca644dc (diff)
btrfs: drop gfp parameter from alloc_extent_map
pass GFP_NOFS directly to kmem_cache_alloc Signed-off-by: David Sterba <dsterba@suse.cz>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index f54c015cc294..26f4d56cf049 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -649,7 +649,7 @@ retry:
649 async_extent->start + 649 async_extent->start +
650 async_extent->ram_size - 1, 0); 650 async_extent->ram_size - 1, 0);
651 651
652 em = alloc_extent_map(GFP_NOFS); 652 em = alloc_extent_map();
653 BUG_ON(!em); 653 BUG_ON(!em);
654 em->start = async_extent->start; 654 em->start = async_extent->start;
655 em->len = async_extent->ram_size; 655 em->len = async_extent->ram_size;
@@ -826,7 +826,7 @@ static noinline int cow_file_range(struct inode *inode,
826 (u64)-1, &ins, 1); 826 (u64)-1, &ins, 1);
827 BUG_ON(ret); 827 BUG_ON(ret);
828 828
829 em = alloc_extent_map(GFP_NOFS); 829 em = alloc_extent_map();
830 BUG_ON(!em); 830 BUG_ON(!em);
831 em->start = start; 831 em->start = start;
832 em->orig_start = em->start; 832 em->orig_start = em->start;
@@ -1177,7 +1177,7 @@ out_check:
1177 struct extent_map *em; 1177 struct extent_map *em;
1178 struct extent_map_tree *em_tree; 1178 struct extent_map_tree *em_tree;
1179 em_tree = &BTRFS_I(inode)->extent_tree; 1179 em_tree = &BTRFS_I(inode)->extent_tree;
1180 em = alloc_extent_map(GFP_NOFS); 1180 em = alloc_extent_map();
1181 BUG_ON(!em); 1181 BUG_ON(!em);
1182 em->start = cur_offset; 1182 em->start = cur_offset;
1183 em->orig_start = em->start; 1183 em->orig_start = em->start;
@@ -5069,7 +5069,7 @@ again:
5069 else 5069 else
5070 goto out; 5070 goto out;
5071 } 5071 }
5072 em = alloc_extent_map(GFP_NOFS); 5072 em = alloc_extent_map();
5073 if (!em) { 5073 if (!em) {
5074 err = -ENOMEM; 5074 err = -ENOMEM;
5075 goto out; 5075 goto out;
@@ -5382,7 +5382,7 @@ struct extent_map *btrfs_get_extent_fiemap(struct inode *inode, struct page *pag
5382 u64 hole_start = start; 5382 u64 hole_start = start;
5383 u64 hole_len = len; 5383 u64 hole_len = len;
5384 5384
5385 em = alloc_extent_map(GFP_NOFS); 5385 em = alloc_extent_map();
5386 if (!em) { 5386 if (!em) {
5387 err = -ENOMEM; 5387 err = -ENOMEM;
5388 goto out; 5388 goto out;
@@ -5483,7 +5483,7 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode,
5483 } 5483 }
5484 5484
5485 if (!em) { 5485 if (!em) {
5486 em = alloc_extent_map(GFP_NOFS); 5486 em = alloc_extent_map();
5487 if (!em) { 5487 if (!em) {
5488 em = ERR_PTR(-ENOMEM); 5488 em = ERR_PTR(-ENOMEM);
5489 goto out; 5489 goto out;