summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2017-02-09 17:42:02 +0100
committerDavid Sterba <dsterba@suse.com>2017-03-08 13:00:47 +0100
commitaee9207ece3050c8929ee6a0f8dbe314c8f9a3a1 (patch)
treeeb5631bfde25ec39594990e99efcd2d663e863cd
parentdbe176d71af43cf46e09912cc9966b76d9869249 (diff)
btrfs-progs: remove unused argument from set_extent_bits
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r--chunk-recover.c2
-rw-r--r--convert/main.c2
-rw-r--r--extent-tree.c16
-rw-r--r--extent_io.c5
-rw-r--r--extent_io.h3
5 files changed, 13 insertions, 15 deletions
diff --git a/chunk-recover.c b/chunk-recover.c
index c1aea39a..0dec7d98 100644
--- a/chunk-recover.c
+++ b/chunk-recover.c
@@ -1115,7 +1115,7 @@ static int block_group_free_all_extent(struct btrfs_root *root,
end = start + cache->key.offset - 1;
set_extent_bits(&info->block_group_cache, start, end,
- BLOCK_GROUP_DIRTY, GFP_NOFS);
+ BLOCK_GROUP_DIRTY);
set_extent_dirty(&info->free_space_cache, start, end, GFP_NOFS);
btrfs_set_block_group_used(&cache->item, 0);
diff --git a/convert/main.c b/convert/main.c
index 40fc30a1..57db3f55 100644
--- a/convert/main.c
+++ b/convert/main.c
@@ -1627,7 +1627,7 @@ static int do_rollback(const char *devname)
break;
set_extent_bits(&io_tree, offset, offset + num_bytes - 1,
- EXTENT_LOCKED, GFP_NOFS);
+ EXTENT_LOCKED);
set_state_private(&io_tree, offset, bytenr);
next_extent:
offset += btrfs_file_extent_num_bytes(leaf, fi);
diff --git a/extent-tree.c b/extent-tree.c
index 5cc32d4f..9eb3f0ee 100644
--- a/extent-tree.c
+++ b/extent-tree.c
@@ -1963,7 +1963,7 @@ static int update_block_group(struct btrfs_trans_handle *trans,
start = cache->key.objectid;
end = start + cache->key.offset - 1;
set_extent_bits(&info->block_group_cache, start, end,
- BLOCK_GROUP_DIRTY, GFP_NOFS);
+ BLOCK_GROUP_DIRTY);
old_val = btrfs_block_group_used(&cache->item);
num_bytes = min(total, cache->key.offset - byte_in_group);
@@ -2496,7 +2496,7 @@ int btrfs_free_extent(struct btrfs_trans_handle *trans,
set_extent_bits(&root->fs_info->pending_del,
bytenr, bytenr + num_bytes - 1,
- EXTENT_LOCKED, GFP_NOFS);
+ EXTENT_LOCKED);
set_state_private(&root->fs_info->pending_del,
bytenr, (unsigned long)extent_op);
return 0;
@@ -2785,7 +2785,7 @@ static int alloc_tree_block(struct btrfs_trans_handle *trans,
set_extent_bits(&root->fs_info->extent_ins, ins->objectid,
ins->objectid + ins->offset - 1,
- EXTENT_LOCKED, GFP_NOFS);
+ EXTENT_LOCKED);
set_state_private(&root->fs_info->extent_ins,
ins->objectid, (unsigned long)extent_op);
} else {
@@ -3295,7 +3295,7 @@ int btrfs_read_block_groups(struct btrfs_root *root)
/* use EXTENT_LOCKED to prevent merging */
set_extent_bits(block_group_cache, found_key.objectid,
found_key.objectid + found_key.offset - 1,
- bit | EXTENT_LOCKED, GFP_NOFS);
+ bit | EXTENT_LOCKED);
set_state_private(block_group_cache, found_key.objectid,
(unsigned long)cache);
}
@@ -3335,7 +3335,7 @@ btrfs_add_block_group(struct btrfs_fs_info *fs_info, u64 bytes_used, u64 type,
bit = block_group_state_bits(type);
ret = set_extent_bits(block_group_cache, chunk_offset,
chunk_offset + size - 1,
- bit | EXTENT_LOCKED, GFP_NOFS);
+ bit | EXTENT_LOCKED);
BUG_ON(ret);
ret = set_state_private(block_group_cache, chunk_offset,
@@ -3448,7 +3448,7 @@ int btrfs_make_block_groups(struct btrfs_trans_handle *trans,
set_extent_bits(block_group_cache, cur_start,
cur_start + group_size - 1,
- bit | EXTENT_LOCKED, GFP_NOFS);
+ bit | EXTENT_LOCKED);
set_state_private(block_group_cache, cur_start,
(unsigned long)cache);
cur_start += group_size;
@@ -3870,7 +3870,7 @@ int btrfs_fix_block_accounting(struct btrfs_trans_handle *trans,
set_extent_bits(&root->fs_info->block_group_cache,
cache->key.objectid,
cache->key.objectid + cache->key.offset -1,
- BLOCK_GROUP_DIRTY, GFP_NOFS);
+ BLOCK_GROUP_DIRTY);
}
btrfs_init_path(&path);
@@ -4140,7 +4140,7 @@ static int add_excluded_extent(struct btrfs_root *root,
{
u64 end = start + num_bytes - 1;
set_extent_bits(&root->fs_info->pinned_extents,
- start, end, EXTENT_UPTODATE, GFP_NOFS);
+ start, end, EXTENT_UPTODATE);
return 0;
}
diff --git a/extent_io.c b/extent_io.c
index d0ae7638..8ee5d5b2 100644
--- a/extent_io.c
+++ b/extent_io.c
@@ -286,8 +286,7 @@ search_again:
/*
* set some bits on a range in the tree.
*/
-int set_extent_bits(struct extent_io_tree *tree, u64 start,
- u64 end, int bits, gfp_t mask)
+int set_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits)
{
struct extent_state *state;
struct extent_state *prealloc = NULL;
@@ -413,7 +412,7 @@ search_again:
int set_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end,
gfp_t mask)
{
- return set_extent_bits(tree, start, end, EXTENT_DIRTY, mask);
+ return set_extent_bits(tree, start, end, EXTENT_DIRTY);
}
int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end,
diff --git a/extent_io.h b/extent_io.h
index 1203f610..d9b48abf 100644
--- a/extent_io.h
+++ b/extent_io.h
@@ -107,8 +107,7 @@ static inline void extent_buffer_get(struct extent_buffer *eb)
void extent_io_tree_init(struct extent_io_tree *tree);
void extent_io_tree_cleanup(struct extent_io_tree *tree);
-int set_extent_bits(struct extent_io_tree *tree, u64 start,
- u64 end, int bits, gfp_t mask);
+int set_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits);
int clear_extent_bits(struct extent_io_tree *tree, u64 start, u64 end, int bits);
int find_first_extent_bit(struct extent_io_tree *tree, u64 start,
u64 *start_ret, u64 *end_ret, int bits);