Eric Lee / smarc-uboot

Download as
Browse Code »

Commit 398d6fad921ec0bc82ae98250831216a363c38b6

Authored by Stefan Brüns
Committed by Tom Rini
1 parent b7dd40d052
Exists in v2017.01-smarct4x and in 25 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ext4: Only update number of of unused inodes if GDT_CSUM feature is set 

e2fsck warns about "Group descriptor 0 marked uninitialized without
feature set."
The bg_itable_unused field is only defined if FEATURE_RO_COMPAT_GDT_CSUM
is set, and should be set (kept) zero otherwise.

Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
Reviewed-by: Lukasz Majewski <l.majewski@samsung.com>

Showing 1 changed file with 7 additions and 7 deletions Side-by-side Diff

fs/ext4/ext4_common.c
Diff comments   View file @ 398d6fa
... ... @@ -988,12 +988,13 @@
988 988 if (!journal_buffer || !zero_buffer)
989 989 goto fail;
990 990 struct ext2_block_group *bgd = (struct ext2_block_group *)fs->gdtable;
  991 + int has_gdt_chksum = le32_to_cpu(fs->sb->feature_ro_compat) &
  992 + EXT4_FEATURE_RO_COMPAT_GDT_CSUM ? 1 : 0;
991 993  
992 994 if (fs->first_pass_ibmap == 0) {
993 995 for (i = 0; i < fs->no_blkgrp; i++) {
994 996 if (bgd[i].free_inodes) {
995   - if (bgd[i].bg_itable_unused !=
996   - bgd[i].free_inodes)
  997 + if (has_gdt_chksum)
997 998 bgd[i].bg_itable_unused =
998 999 bgd[i].free_inodes;
999 1000 if (le16_to_cpu(bgd[i].bg_flags) & EXT4_BG_INODE_UNINIT) {
... ... @@ -1014,7 +1015,8 @@
1014 1015 (i * inodes_per_grp);
1015 1016 fs->first_pass_ibmap++;
1016 1017 ext4fs_bg_free_inodes_dec(&bgd[i]);
1017   - ext4fs_bg_itable_unused_dec(&bgd[i]);
  1018 + if (has_gdt_chksum)
  1019 + ext4fs_bg_itable_unused_dec(&bgd[i]);
1018 1020 ext4fs_sb_free_inodes_dec(fs->sb);
1019 1021 status = ext4fs_devread(
1020 1022 (lbaint_t)le32_to_cpu(bgd[i].inode_id) *
1021 1023  
... ... @@ -1069,12 +1071,10 @@
1069 1071 goto fail;
1070 1072 prev_inode_bitmap_index = ibmap_idx;
1071 1073 }
1072   - if (bgd[ibmap_idx].bg_itable_unused !=
1073   - bgd[ibmap_idx].free_inodes)
  1074 + ext4fs_bg_free_inodes_dec(&bgd[ibmap_idx]);
  1075 + if (has_gdt_chksum)
1074 1076 bgd[ibmap_idx].bg_itable_unused =
1075 1077 bgd[ibmap_idx].free_inodes;
1076   - ext4fs_bg_free_inodes_dec(&bgd[ibmap_idx]);
1077   - ext4fs_bg_itable_unused_dec(&bgd[ibmap_idx]);
1078 1078 ext4fs_sb_free_inodes_dec(fs->sb);
1079 1079 goto success;
1080 1080 }