1 files changed, 8 insertions, 8 deletions

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index ba8950bfd9c7..bd5756504709 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -1186,9 +1186,9 @@ static int __clone_root_cmp_bsearch(const void *key, const void *elt)
         u64 root = (u64)(uintptr_t)key;
         struct clone_root *cr = (struct clone_root *)elt;
 
-        if (root < cr->root->objectid)
+        if (root < cr->root->root_key.objectid)
                 return -1;
-        if (root > cr->root->objectid)
+        if (root > cr->root->root_key.objectid)
                 return 1;
         return 0;
 }
@@ -1198,9 +1198,9 @@ static int __clone_root_cmp_sort(const void *e1, const void *e2)
         struct clone_root *cr1 = (struct clone_root *)e1;
         struct clone_root *cr2 = (struct clone_root *)e2;
 
-        if (cr1->root->objectid < cr2->root->objectid)
+        if (cr1->root->root_key.objectid < cr2->root->root_key.objectid)
                 return -1;
-        if (cr1->root->objectid > cr2->root->objectid)
+        if (cr1->root->root_key.objectid > cr2->root->root_key.objectid)
                 return 1;
         return 0;
 }
@@ -2346,7 +2346,7 @@ static int send_subvol_begin(struct send_ctx *sctx)
                 return -ENOMEM;
         }
 
-        key.objectid = send_root->objectid;
+        key.objectid = send_root->root_key.objectid;
         key.type = BTRFS_ROOT_BACKREF_KEY;
         key.offset = 0;
 
@@ -2362,7 +2362,7 @@ static int send_subvol_begin(struct send_ctx *sctx)
         leaf = path->nodes[0];
         btrfs_item_key_to_cpu(leaf, &key, path->slots[0]);
         if (key.type != BTRFS_ROOT_BACKREF_KEY ||
-            key.objectid != send_root->objectid) {
+            key.objectid != send_root->root_key.objectid) {
                 ret = -ENOENT;
                 goto out;
         }
@@ -4907,8 +4907,8 @@ static int send_clone(struct send_ctx *sctx,
 
         btrfs_debug(sctx->send_root->fs_info,
                     "send_clone offset=%llu, len=%d, clone_root=%llu, clone_inode=%llu, clone_offset=%llu",
-                    offset, len, clone_root->root->objectid, clone_root->ino,
-                    clone_root->offset);
+                    offset, len, clone_root->root->root_key.objectid,
+                    clone_root->ino, clone_root->offset);
 
         p = fs_path_alloc();
         if (!p)