diff options
| -rw-r--r-- | cmds-check.c | 6 | ||||
| -rw-r--r-- | convert/main.c | 3 | ||||
| -rw-r--r-- | extent-tree.c | 12 | ||||
| -rw-r--r-- | extent_io.c | 5 | ||||
| -rw-r--r-- | extent_io.h | 3 |
5 files changed, 11 insertions, 18 deletions
diff --git a/cmds-check.c b/cmds-check.c index a69107da..7e949277 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -9186,8 +9186,7 @@ static void reset_cached_block_groups(struct btrfs_fs_info *fs_info) &start, &end, EXTENT_DIRTY); if (ret) break; - clear_extent_dirty(&fs_info->free_space_cache, start, end, - GFP_NOFS); + clear_extent_dirty(&fs_info->free_space_cache, start, end); } start = 0; @@ -9356,8 +9355,7 @@ static int check_extent_refs(struct btrfs_root *root, if (!init_extent_tree && repair && (!cur_err || fix)) clear_extent_dirty(root->fs_info->excluded_extents, rec->start, - rec->start + rec->max_size - 1, - GFP_NOFS); + rec->start + rec->max_size - 1); free(rec); } repair_abort: diff --git a/convert/main.c b/convert/main.c index 57db3f55..dc6047e6 100644 --- a/convert/main.c +++ b/convert/main.c @@ -1741,8 +1741,7 @@ next_extent: ret = get_state_private(&io_tree, start, &bytenr); BUG_ON(ret); - clear_extent_bits(&io_tree, start, end, EXTENT_LOCKED, - GFP_NOFS); + clear_extent_bits(&io_tree, start, end, EXTENT_LOCKED); while (start <= end) { if (start == BTRFS_SUPER_INFO_OFFSET) { diff --git a/extent-tree.c b/extent-tree.c index 8b16b07e..3e32e43b 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -80,7 +80,7 @@ static int remove_sb_from_cache(struct btrfs_root *root, BUG_ON(ret); while (nr--) { clear_extent_dirty(free_space_cache, logical[nr], - logical[nr] + stripe_len - 1, GFP_NOFS); + logical[nr] + stripe_len - 1); } kfree(logical); } @@ -1996,7 +1996,7 @@ static int update_pinned_extents(struct btrfs_root *root, bytenr, bytenr + num - 1); } else { clear_extent_dirty(&fs_info->pinned_extents, - bytenr, bytenr + num - 1, GFP_NOFS); + bytenr, bytenr + num - 1); } while (num > 0) { cache = btrfs_lookup_block_group(fs_info, bytenr); @@ -2039,7 +2039,7 @@ int btrfs_finish_extent_commit(struct btrfs_trans_handle *trans, if (ret) break; update_pinned_extents(root, start, end + 1 - start, 0); - clear_extent_dirty(unpin, start, end, GFP_NOFS); + clear_extent_dirty(unpin, start, end); set_extent_dirty(free_space_cache, start, end); } return 0; @@ -2695,8 +2695,7 @@ int btrfs_reserve_extent(struct btrfs_trans_handle *trans, trans->alloc_exclude_nr, data); BUG_ON(ret); clear_extent_dirty(&root->fs_info->free_space_cache, - ins->objectid, ins->objectid + ins->offset - 1, - GFP_NOFS); + ins->objectid, ins->objectid + ins->offset - 1); return ret; } @@ -3123,8 +3122,7 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) &start, &end, EXTENT_DIRTY); if (ret) break; - clear_extent_dirty(&info->free_space_cache, start, - end, GFP_NOFS); + clear_extent_dirty(&info->free_space_cache, start, end); } while (!list_empty(&info->space_info)) { diff --git a/extent_io.c b/extent_io.c index d9766787..915c6ed8 100644 --- a/extent_io.c +++ b/extent_io.c @@ -414,8 +414,7 @@ int set_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end) return set_extent_bits(tree, start, end, EXTENT_DIRTY); } -int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end, - gfp_t mask) +int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end) { return clear_extent_bits(tree, start, end, EXTENT_DIRTY); } @@ -846,7 +845,7 @@ int clear_extent_buffer_dirty(struct extent_buffer *eb) struct extent_io_tree *tree = eb->tree; if (eb->flags & EXTENT_DIRTY) { eb->flags &= ~EXTENT_DIRTY; - clear_extent_dirty(tree, eb->start, eb->start + eb->len - 1, 0); + clear_extent_dirty(tree, eb->start, eb->start + eb->len - 1); free_extent_buffer(eb); } return 0; diff --git a/extent_io.h b/extent_io.h index ae5ef57b..e6174894 100644 --- a/extent_io.h +++ b/extent_io.h @@ -114,8 +114,7 @@ int find_first_extent_bit(struct extent_io_tree *tree, u64 start, 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); -int clear_extent_dirty(struct extent_io_tree *tree, u64 start, - u64 end, gfp_t mask); +int clear_extent_dirty(struct extent_io_tree *tree, u64 start, u64 end); static inline int set_extent_buffer_uptodate(struct extent_buffer *eb) { eb->flags |= EXTENT_UPTODATE; |