2 files changed, 9 insertions, 1 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index b4dbb5c9764..073fdd77c78 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -2239,8 +2239,9 @@ static int btrfs_set_inode_index(struct inode *dir, struct inode *inode,
 
         if (BTRFS_I(dir)->index_cnt == (u64)-1) {
                 ret = btrfs_set_inode_index_count(dir);
-                if (ret)
+                if (ret) {
                         return ret;
+                }
         }
 
         *index = BTRFS_I(dir)->index_cnt;
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 13d7ee8e0c5..3f4b139b27e 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1027,6 +1027,7 @@ static noinline int fixup_inode_link_count(struct btrfs_trans_handle *trans,
                 inode->i_nlink = nlink;
                 btrfs_update_inode(trans, root, inode);
         }
+        BTRFS_I(inode)->index_cnt = (u64)-1;
 
         return 0;
 }
@@ -2714,6 +2715,7 @@ int btrfs_recover_log_trees(struct btrfs_root *log_root_tree)
         struct btrfs_key tmp_key;
         struct btrfs_root *log;
         struct btrfs_fs_info *fs_info = log_root_tree->fs_info;
+        u64 highest_inode;
         struct walk_control wc = {
                 .process_func = process_one_buffer,
                 .stage = 0,
@@ -2772,6 +2774,11 @@ again:
                                                       path);
                         BUG_ON(ret);
                 }
+                ret = btrfs_find_highest_inode(wc.replay_dest, &highest_inode);
+                if (ret == 0) {
+                        wc.replay_dest->highest_inode = highest_inode;
+                        wc.replay_dest->last_inode_alloc = highest_inode;
+                }
 
                 key.offset = found_key.offset - 1;
                 free_extent_buffer(log->node);