Commit 53667634 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba

btrfs: rename btrfs_data_ref->ino to ->objectid

This is how we refer to it in the rest of the extent reference related
code, make it consistent.
Reviewed-by: default avatarFilipe Manana <fdmanana@suse.com>
Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cf4f0432
...@@ -983,7 +983,7 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info, ...@@ -983,7 +983,7 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info,
INIT_LIST_HEAD(&ref->add_list); INIT_LIST_HEAD(&ref->add_list);
if (generic_ref->type == BTRFS_REF_DATA) { if (generic_ref->type == BTRFS_REF_DATA) {
ref->data_ref.objectid = generic_ref->data_ref.ino; ref->data_ref.objectid = generic_ref->data_ref.objectid;
ref->data_ref.offset = generic_ref->data_ref.offset; ref->data_ref.offset = generic_ref->data_ref.offset;
} else { } else {
ref->tree_ref.level = generic_ref->tree_ref.level; ref->tree_ref.level = generic_ref->tree_ref.level;
...@@ -1014,7 +1014,7 @@ void btrfs_init_data_ref(struct btrfs_ref *generic_ref, u64 ino, u64 offset, ...@@ -1014,7 +1014,7 @@ void btrfs_init_data_ref(struct btrfs_ref *generic_ref, u64 ino, u64 offset,
/* If @real_root not set, use @root as fallback */ /* If @real_root not set, use @root as fallback */
generic_ref->real_root = mod_root ?: generic_ref->ref_root; generic_ref->real_root = mod_root ?: generic_ref->ref_root;
#endif #endif
generic_ref->data_ref.ino = ino; generic_ref->data_ref.objectid = ino;
generic_ref->data_ref.offset = offset; generic_ref->data_ref.offset = offset;
generic_ref->type = BTRFS_REF_DATA; generic_ref->type = BTRFS_REF_DATA;
if (skip_qgroup || !(is_fstree(generic_ref->ref_root) && if (skip_qgroup || !(is_fstree(generic_ref->ref_root) &&
......
...@@ -226,7 +226,7 @@ struct btrfs_data_ref { ...@@ -226,7 +226,7 @@ struct btrfs_data_ref {
/* For EXTENT_DATA_REF */ /* For EXTENT_DATA_REF */
/* Inode which refers to this data extent */ /* Inode which refers to this data extent */
u64 ino; u64 objectid;
/* /*
* file_offset - extent_offset * file_offset - extent_offset
......
...@@ -688,7 +688,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info, ...@@ -688,7 +688,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,
owner = generic_ref->tree_ref.level; owner = generic_ref->tree_ref.level;
} else if (!parent) { } else if (!parent) {
ref_root = generic_ref->ref_root; ref_root = generic_ref->ref_root;
owner = generic_ref->data_ref.ino; owner = generic_ref->data_ref.objectid;
offset = generic_ref->data_ref.offset; offset = generic_ref->data_ref.offset;
} }
metadata = owner < BTRFS_FIRST_FREE_OBJECTID; metadata = owner < BTRFS_FIRST_FREE_OBJECTID;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment