ocfs2: correct l_next_free_rec in online check
authorJulian Sun <sunjunchao2870@gmail.com>
Mon, 6 Jan 2025 02:34:32 +0000 (10:34 +0800)
committerAndrew Morton <akpm@linux-foundation.org>
Sat, 25 Jan 2025 06:47:23 +0000 (22:47 -0800)
Correct the value of l_next_free_rec to l_count during the online check,
as done in the check_el() function in ocfs2_tools.

Link: https://lkml.kernel.org/r/20250106023432.1320904-2-sunjunchao2870@gmail.com
Signed-off-by: Julian Sun <sunjunchao2870@gmail.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/ocfs2/inode.c

index cd3173062ae35e603d88e53cecb415fd49c4cda8..12e5d1f733256a9c9810ba24da56a78287bc4b6a 100644 (file)
@@ -200,6 +200,20 @@ bail:
        return inode;
 }
 
+static int ocfs2_dinode_has_extents(struct ocfs2_dinode *di)
+{
+       /* inodes flagged with other stuff in id2 */
+       if (di->i_flags & (OCFS2_SUPER_BLOCK_FL | OCFS2_LOCAL_ALLOC_FL |
+                          OCFS2_CHAIN_FL | OCFS2_DEALLOC_FL))
+               return 0;
+       /* i_flags doesn't indicate when id2 is a fast symlink */
+       if (S_ISLNK(di->i_mode) && di->i_size && di->i_clusters == 0)
+               return 0;
+       if (di->i_dyn_features & OCFS2_INLINE_DATA_FL)
+               return 0;
+
+       return 1;
+}
 
 /*
  * here's how inodes get read from disk:
@@ -1547,6 +1561,16 @@ static int ocfs2_filecheck_repair_inode_block(struct super_block *sb,
                     le32_to_cpu(di->i_fs_generation));
        }
 
+       if (ocfs2_dinode_has_extents(di) &&
+           le16_to_cpu(di->id2.i_list.l_next_free_rec) > le16_to_cpu(di->id2.i_list.l_count)) {
+               di->id2.i_list.l_next_free_rec = di->id2.i_list.l_count;
+               changed = 1;
+               mlog(ML_ERROR,
+                    "Filecheck: reset dinode #%llu: l_next_free_rec to %u\n",
+                    (unsigned long long)bh->b_blocknr,
+                    le16_to_cpu(di->id2.i_list.l_next_free_rec));
+       }
+
        if (changed || ocfs2_validate_meta_ecc(sb, bh->b_data, &di->i_check)) {
                ocfs2_compute_meta_ecc(sb, bh->b_data, &di->i_check);
                mark_buffer_dirty(bh);