Eric Lee / smarc-uboot

Download as
Browse Code »

Commit e927265225bf298d25b312758718cbc31510b175

Authored by Stefan Brüns
Committed by Tom Rini
1 parent 398d6fad92
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: Do not clear zalloc'ed buffers a second time 

zero_buffer is never written, thus clearing it is pointless.
journal_buffer is completely initialized by ext4fs_devread (or in case
of failure, not used).

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

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

fs/ext4/ext4_common.c
Diff comments   View file @ e927265
... ... @@ -929,7 +929,6 @@
929 929  
930 930 if (le16_to_cpu(bgd[bg_idx].bg_flags) & EXT4_BG_BLOCK_UNINIT) {
931 931 uint16_t new_flags;
932   - memset(zero_buffer, '\0', fs->blksz);
933 932 put_ext4((uint64_t)le32_to_cpu(bgd[bg_idx].block_id) * fs->blksz,
934 933 zero_buffer, fs->blksz);
935 934 memcpy(fs->blk_bmaps[bg_idx], zero_buffer, fs->blksz);
... ... @@ -946,7 +945,6 @@
946 945  
947 946 /* journal backup */
948 947 if (prev_bg_bitmap_index != bg_idx) {
949   - memset(journal_buffer, '\0', fs->blksz);
950 948 status = ext4fs_devread(
951 949 (lbaint_t)le32_to_cpu(bgd[bg_idx].block_id)
952 950 * fs->sect_perblk,
... ... @@ -1040,7 +1038,6 @@
1040 1038 ibmap_idx = fs->curr_inode_no / inodes_per_grp;
1041 1039 if (le16_to_cpu(bgd[ibmap_idx].bg_flags) & EXT4_BG_INODE_UNINIT) {
1042 1040 int new_flags;
1043   - memset(zero_buffer, '\0', fs->blksz);
1044 1041 put_ext4((uint64_t)le32_to_cpu(bgd[ibmap_idx].inode_id) * fs->blksz,
1045 1042 zero_buffer, fs->blksz);
1046 1043 new_flags = le16_to_cpu(bgd[ibmap_idx].bg_flags) & ~EXT4_BG_INODE_UNINIT;