@@ -419,9 +419,9 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
BUG_ON(ret);
}
if (new_flags != 0) {
- ret = btrfs_set_block_flags(trans, buf->start,
- btrfs_header_level(buf),
- new_flags);
+ ret = btrfs_set_disk_extent_flags(trans, buf->start,
+ btrfs_header_level(buf),
+ new_flags);
BUG_ON(ret);
}
} else {
@@ -859,8 +859,8 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans,
int btrfs_lookup_extent_info(struct btrfs_trans_handle *trans,
struct btrfs_fs_info *fs_info, u64 bytenr,
u64 offset, int metadata, u64 *refs, u64 *flags);
-int btrfs_set_block_flags(struct btrfs_trans_handle *trans, u64 bytenr,
- int level, u64 flags);
+int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans, u64 bytenr,
+ int level, u64 flags);
int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
struct extent_buffer *buf, int record_parent);
int btrfs_dec_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -1375,8 +1375,8 @@ out:
return ret;
}
-int btrfs_set_block_flags(struct btrfs_trans_handle *trans, u64 bytenr,
- int level, u64 flags)
+int btrfs_set_disk_extent_flags(struct btrfs_trans_handle *trans, u64 bytenr,
+ int level, u64 flags)
{
struct btrfs_fs_info *fs_info = trans->fs_info;
struct btrfs_root *extent_root = btrfs_extent_root(fs_info, bytenr);
This helper in the kernel is named btrfs_set_disk_extent_flags, which is a more accurate description than btrfs_set_block_flags. Rename to the in kernel name to make sync'ing ctree.c easier. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- kernel-shared/ctree.c | 6 +++--- kernel-shared/ctree.h | 4 ++-- kernel-shared/extent-tree.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)