Skip to content

Commit 4aec05f

Browse files
josefbacikkdave
authored andcommitted
btrfs: remove level argument from btrfs_set_block_flags
We just pass in btrfs_header_level(eb) for the level, and we're passing in the eb already, so simply get the level from the eb inside of btrfs_set_block_flags. Reviewed-by: Johannes Thumshirn <[email protected]> Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: David Sterba <[email protected]>
1 parent 54d687c commit 4aec05f

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

fs/btrfs/ctree.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,10 +464,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
464464
return ret;
465465
}
466466
if (new_flags != 0) {
467-
int level = btrfs_header_level(buf);
468-
469-
ret = btrfs_set_disk_extent_flags(trans, buf,
470-
new_flags, level);
467+
ret = btrfs_set_disk_extent_flags(trans, buf, new_flags);
471468
if (ret)
472469
return ret;
473470
}

fs/btrfs/extent-tree.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,10 +2152,10 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans,
21522152
}
21532153

21542154
int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
2155-
struct extent_buffer *eb, u64 flags,
2156-
int level)
2155+
struct extent_buffer *eb, u64 flags)
21572156
{
21582157
struct btrfs_delayed_extent_op *extent_op;
2158+
int level = btrfs_header_level(eb);
21592159
int ret;
21602160

21612161
extent_op = btrfs_alloc_delayed_extent_op();
@@ -5095,8 +5095,7 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans,
50955095
BUG_ON(ret); /* -ENOMEM */
50965096
ret = btrfs_dec_ref(trans, root, eb, 0);
50975097
BUG_ON(ret); /* -ENOMEM */
5098-
ret = btrfs_set_disk_extent_flags(trans, eb, flag,
5099-
btrfs_header_level(eb));
5098+
ret = btrfs_set_disk_extent_flags(trans, eb, flag);
51005099
BUG_ON(ret); /* -ENOMEM */
51015100
wc->flags[level] |= flag;
51025101
}

fs/btrfs/extent-tree.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
141141
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
142142
struct extent_buffer *buf, int full_backref);
143143
int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans,
144-
struct extent_buffer *eb, u64 flags, int level);
144+
struct extent_buffer *eb, u64 flags);
145145
int btrfs_free_extent(struct btrfs_trans_handle *trans, struct btrfs_ref *ref);
146146

147147
int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,

0 commit comments

Comments
 (0)