Fix file size rebuild and i_blocks in file log replaying

Author: Andiry

fs/nova/rebuild.c

@@ -368,7 +368,7 @@ static void nova_rebuild_handle_write_entry(struct super_block *sb,
 		nova_assign_write_entry(sb, sih, entry, entryc, false);
 	}
 
-	if (entryc->trans_id >= sih->trans_id) {
+	if (entryc->trans_id >= reb->trans_id) {
 		nova_rebuild_file_time_and_size(sb, reb,
 					entryc->mtime, entryc->mtime,
 					entryc->size);
@@ -497,6 +497,8 @@ static int nova_rebuild_file_inode_tree(struct super_block *sb,
 
 	ret = nova_rebuild_inode_finish(sb, pi, sih, reb, curr_p);
 	sih->i_blocks = sih->i_size >> data_bits;
+	if (sih->i_size % (1 << data_bits) > 0)
+		++sih->i_blocks;
 
 out:
 //	nova_print_inode_log_page(sb, inode);
@@ -845,6 +847,8 @@ int nova_restore_snapshot_table(struct super_block *sb, int just_init)
 
 	ret = nova_rebuild_inode_finish(sb, pi, sih, reb, curr_p);
 	sih->i_blocks = sih->i_size >> data_bits;
+	if (sih->i_size % (1 << data_bits) > 0)
+		++sih->i_blocks;
 
 out:
 //	nova_print_inode_log_page(sb, inode);