1 files changed, 3 insertions, 4 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 7a0e3f8dec5c..77b6797fcac3 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -506,7 +506,7 @@ insert:
                             ino_size != 0) {
                                 struct btrfs_map_token token;
 
-                                btrfs_init_map_token(&token);
+                                btrfs_init_map_token(&token, dst_eb);
                                 btrfs_set_token_inode_size(dst_eb, dst_item,
                                                            ino_size, &token);
                         }
@@ -3842,7 +3842,7 @@ static void fill_inode_item(struct btrfs_trans_handle *trans,
 {
         struct btrfs_map_token token;
 
-        btrfs_init_map_token(&token);
+        btrfs_init_map_token(&token, leaf);
 
         if (log_inode_only) {
                 /* set the generation to zero so the recover code
@@ -4302,8 +4302,6 @@ static int log_one_extent(struct btrfs_trans_handle *trans,
         if (ret)
                 return ret;
 
-        btrfs_init_map_token(&token);
-
         ret = __btrfs_drop_extents(trans, log, &inode->vfs_inode, path, em->start,
                                    em->start + em->len, NULL, 0, 1,
                                    sizeof(*fi), &extent_inserted);
@@ -4321,6 +4319,7 @@ static int log_one_extent(struct btrfs_trans_handle *trans,
                         return ret;
         }
         leaf = path->nodes[0];
+        btrfs_init_map_token(&token, leaf);
         fi = btrfs_item_ptr(leaf, path->slots[0],
                             struct btrfs_file_extent_item);