diff options
| author | Josef Bacik <josef@toxicpanda.com> | 2024-04-12 23:01:38 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2024-05-07 21:31:05 +0200 |
| commit | 53667634467178f0049d9d5300fabd017dfb5477 (patch) | |
| tree | 9329a06ef16a61489667258c3ef2e65ec0839aa6 /fs/btrfs | |
| parent | cf4f04325b2b27efa5697ba0ea4c1abdee0035b4 (diff) | |
| download | linux-53667634467178f0049d9d5300fabd017dfb5477.tar.gz linux-53667634467178f0049d9d5300fabd017dfb5477.tar.bz2 linux-53667634467178f0049d9d5300fabd017dfb5477.zip | |
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: 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>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/delayed-ref.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/delayed-ref.h | 2 | ||||
| -rw-r--r-- | fs/btrfs/ref-verify.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c index 7342e8778166..8d553347e11b 100644 --- a/fs/btrfs/delayed-ref.c +++ b/fs/btrfs/delayed-ref.c @@ -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) && diff --git a/fs/btrfs/delayed-ref.h b/fs/btrfs/delayed-ref.h index ec53404cec0c..abfb565ec310 100644 --- a/fs/btrfs/delayed-ref.h +++ b/fs/btrfs/delayed-ref.h @@ -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 diff --git a/fs/btrfs/ref-verify.c b/fs/btrfs/ref-verify.c index 94bbb7ef9a13..cf531255ab76 100644 --- a/fs/btrfs/ref-verify.c +++ b/fs/btrfs/ref-verify.c @@ -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; |