system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-07-21 10:41:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

btrfs: rename btrfs_data_ref->ino to ->objectid

Browse source 
This is how we refer to it in the rest of the extent reference related
code, make it consistent.

Reviewed-by: Filipe Manana <fdmanana@suse.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Josef Bacik 2024-04-12 23:01:38 -04:00 committed by David Sterba
parent cf4f04325b
commit 5366763446
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/btrfs/delayed-ref.c
View file

@ -983,7 +983,7 @@ static void init_delayed_ref_common(struct btrfs_fs_info *fs_info,
INIT_LIST_HEAD(&ref->add_list);
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;
} else {
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,
/* If @real_root not set, use @root as fallback */
generic_ref->real_root = mod_root ?: generic_ref->ref_root;
#endif
generic_ref->data_ref.ino = ino;
generic_ref->data_ref.objectid = ino;
generic_ref->data_ref.offset = offset;
generic_ref->type = BTRFS_REF_DATA;
if (skip_qgroup || !(is_fstree(generic_ref->ref_root) &&

2
fs/btrfs/delayed-ref.h
View file

@ -226,7 +226,7 @@ struct btrfs_data_ref {
/* For EXTENT_DATA_REF */
/* Inode which refers to this data extent */
u64 ino;
u64 objectid;
/*
* file_offset - extent_offset

2
fs/btrfs/ref-verify.c
View file

@ -688,7 +688,7 @@ int btrfs_ref_tree_mod(struct btrfs_fs_info *fs_info,
owner = generic_ref->tree_ref.level;
} else if (!parent) {
ref_root = generic_ref->ref_root;
owner = generic_ref->data_ref.ino;
owner = generic_ref->data_ref.objectid;
offset = generic_ref->data_ref.offset;
}
metadata = owner < BTRFS_FIRST_FREE_OBJECTID;