From e1a67a59a9490003f685141c0478be8e6827c736 Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 9 Feb 2017 17:42:02 +0100 Subject: [PATCH] btrfs-progs: remove unused argument from set_extent_dirty Signed-off-by: David Sterba --- chunk-recover.c | 2 +- cmds-check.c | 9 +++------ extent-tree.c | 13 +++++-------- extent_io.c | 5 ++--- extent_io.h | 3 +-- mkfs/main.c | 4 ++-- 6 files changed, 14 insertions(+), 22 deletions(-) diff --git a/chunk-recover.c b/chunk-recover.c index 7aac848..0dc8a43 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -1116,7 +1116,7 @@ static int block_group_free_all_extent(struct btrfs_root *root, set_extent_bits(&info->block_group_cache, start, end, BLOCK_GROUP_DIRTY); - set_extent_dirty(&info->free_space_cache, start, end, GFP_NOFS); + set_extent_dirty(&info->free_space_cache, start, end); btrfs_set_block_group_used(&cache->item, 0); diff --git a/cmds-check.c b/cmds-check.c index dfb3476..a69107d 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -9221,8 +9221,7 @@ static int check_extent_refs(struct btrfs_root *root, rec = container_of(cache, struct extent_record, cache); set_extent_dirty(root->fs_info->excluded_extents, rec->start, - rec->start + rec->max_size - 1, - GFP_NOFS); + rec->start + rec->max_size - 1); cache = next_cache_extent(cache); } @@ -9231,8 +9230,7 @@ static int check_extent_refs(struct btrfs_root *root, while(cache) { set_extent_dirty(root->fs_info->excluded_extents, cache->start, - cache->start + cache->size - 1, - GFP_NOFS); + cache->start + cache->size - 1); cache = next_cache_extent(cache); } prune_corrupt_blocks(root->fs_info); @@ -11676,8 +11674,7 @@ static int reset_block_groups(struct btrfs_fs_info *fs_info) key.objectid, key.offset, btrfs_chunk_length(leaf, chunk)); set_extent_dirty(&fs_info->free_space_cache, key.offset, - key.offset + btrfs_chunk_length(leaf, chunk), - GFP_NOFS); + key.offset + btrfs_chunk_length(leaf, chunk)); path.slots[0]++; } start = 0; diff --git a/extent-tree.c b/extent-tree.c index 9eb3f0e..8b16b07 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -149,8 +149,7 @@ static int cache_block_group(struct btrfs_root *root, if (key.objectid > last) { hole_size = key.objectid - last; set_extent_dirty(free_space_cache, last, - last + hole_size - 1, - GFP_NOFS); + last + hole_size - 1); } if (key.type == BTRFS_METADATA_ITEM_KEY) last = key.objectid + root->nodesize; @@ -165,8 +164,7 @@ next: block_group->key.offset > last) { hole_size = block_group->key.objectid + block_group->key.offset - last; - set_extent_dirty(free_space_cache, last, - last + hole_size - 1, GFP_NOFS); + set_extent_dirty(free_space_cache, last, last + hole_size - 1); } remove_sb_from_cache(root, block_group); block_group->cached = 1; @@ -1976,8 +1974,7 @@ static int update_block_group(struct btrfs_trans_handle *trans, cache->space_info->bytes_used -= num_bytes; if (mark_free) { set_extent_dirty(&info->free_space_cache, - bytenr, bytenr + num_bytes - 1, - GFP_NOFS); + bytenr, bytenr + num_bytes - 1); } } btrfs_set_block_group_used(&cache->item, old_val); @@ -1996,7 +1993,7 @@ static int update_pinned_extents(struct btrfs_root *root, if (pin) { set_extent_dirty(&fs_info->pinned_extents, - bytenr, bytenr + num - 1, GFP_NOFS); + bytenr, bytenr + num - 1); } else { clear_extent_dirty(&fs_info->pinned_extents, bytenr, bytenr + num - 1, GFP_NOFS); @@ -2043,7 +2040,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, break; update_pinned_extents(root, start, end + 1 - start, 0); clear_extent_dirty(unpin, start, end, GFP_NOFS); - set_extent_dirty(free_space_cache, start, end, GFP_NOFS); + set_extent_dirty(free_space_cache, start, end); } return 0; } diff --git a/extent_io.c b/extent_io.c index 8ee5d5b..d976678 100644 --- a/extent_io.c +++ b/extent_io.c @@ -409,8 +409,7 @@ search_again: goto again; } -int set_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end, - gfp_t mask) +int set_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end) { return set_extent_bits(tree, start, end, EXTENT_DIRTY); } @@ -836,7 +835,7 @@ int set_extent_buffer_dirty(struct extent_buffer *eb) struct extent_io_tree *tree = eb->tree; if (!(eb->flags & EXTENT_DIRTY)) { eb->flags |= EXTENT_DIRTY; - set_extent_dirty(tree, eb->start, eb->start + eb->len - 1, 0); + set_extent_dirty(tree, eb->start, eb->start + eb->len - 1); extent_buffer_get(eb); } return 0; diff --git a/extent_io.h b/extent_io.h index d9b48ab..ae5ef57 100644 --- a/extent_io.h +++ b/extent_io.h @@ -113,8 +113,7 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start, u64 *start_ret, u64 *end_ret, int bits); int test_range_bit(struct extent_io_tree *tree, u64 start, u64 end, int bits, int filled); -int set_extent_dirty(struct extent_io_tree *tree, u64 start, - u64 end, gfp_t mask); +int set_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end); int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end, gfp_t mask); static inline int set_extent_buffer_uptodate(struct extent_buffer *eb) diff --git a/mkfs/main.c b/mkfs/main.c index 2458288..fb780eb 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1006,7 +1006,7 @@ static int create_chunks(struct btrfs_trans_handle *trans, if (ret) return ret; set_extent_dirty(&root->fs_info->free_space_cache, - chunk_start, chunk_start + chunk_size - 1, 0); + chunk_start, chunk_start + chunk_size - 1); } if (size_of_data < minimum_data_chunk_size) @@ -1023,7 +1023,7 @@ static int create_chunks(struct btrfs_trans_handle *trans, if (ret) return ret; set_extent_dirty(&root->fs_info->free_space_cache, - chunk_start, chunk_start + size_of_data - 1, 0); + chunk_start, chunk_start + size_of_data - 1); return ret; } -- 2.7.4