ext4: Do not clear zalloc'ed buffers a second time
authorStefan Brüns <stefan.bruens@rwth-aachen.de>
Tue, 6 Sep 2016 02:36:48 +0000 (04:36 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 23 Sep 2016 13:02:39 +0000 (09:02 -0400)
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>
fs/ext4/ext4_common.c

index aeccdf17d3c0604a71b73847e58e0c501c5ae205..1661d89ca6d07a142bc58450cf76d620f861e74b 100644 (file)
@@ -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;