From: Stefan Brüns Date: Tue, 6 Sep 2016 02:36:48 +0000 (+0200) Subject: ext4: Do not clear zalloc'ed buffers a second time X-Git-Tag: v2016.11-rc1~88 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e927265225bf298d25b312758718cbc31510b175;p=oweals%2Fu-boot.git 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 Reviewed-by: Lukasz Majewski --- diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index aeccdf17d3..1661d89ca6 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -929,7 +929,6 @@ restart: if (le16_to_cpu(bgd[bg_idx].bg_flags) & EXT4_BG_BLOCK_UNINIT) { uint16_t new_flags; - memset(zero_buffer, '\0', fs->blksz); put_ext4((uint64_t)le32_to_cpu(bgd[bg_idx].block_id) * fs->blksz, zero_buffer, fs->blksz); memcpy(fs->blk_bmaps[bg_idx], zero_buffer, fs->blksz); @@ -946,7 +945,6 @@ restart: /* journal backup */ if (prev_bg_bitmap_index != bg_idx) { - memset(journal_buffer, '\0', fs->blksz); status = ext4fs_devread( (lbaint_t)le32_to_cpu(bgd[bg_idx].block_id) * fs->sect_perblk, @@ -1040,7 +1038,6 @@ restart: ibmap_idx = fs->curr_inode_no / inodes_per_grp; if (le16_to_cpu(bgd[ibmap_idx].bg_flags) & EXT4_BG_INODE_UNINIT) { int new_flags; - memset(zero_buffer, '\0', fs->blksz); put_ext4((uint64_t)le32_to_cpu(bgd[ibmap_idx].inode_id) * fs->blksz, zero_buffer, fs->blksz); new_flags = le16_to_cpu(bgd[ibmap_idx].bg_flags) & ~EXT4_BG_INODE_UNINIT;