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>

diff --git a/fs/btrfs/delayed-ref.c b/fs/btrfs/delayed-ref.c
index 7342e87781669cd55c4b269263fddd38b95d4e5a..8d553347e11b2082c736044105111d4df1d398e7 100644 (file)
--- 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 ec53404cec0cbca0c3f0d8b1eb38e6524df0ec62..abfb565ec310af8fa2446dfba5b8870ef22fa180 100644 (file)
--- 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 94bbb7ef9a133de7dfeccee199bbab1524d7d012..cf531255ab76c6db6f97414fec3f692aed35a30a 100644 (file)
--- 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;