Imported Upstream version 1.47.0

[platform/upstream/e2fsprogs.git] / lib / ext2fs / mkjournal.c

diff --git a/lib/ext2fs/mkjournal.c b/lib/ext2fs/mkjournal.c
index 732ba7d..54772dd 100644 (file)
--- a/lib/ext2fs/mkjournal.c
+++ b/lib/ext2fs/mkjournal.c
@@ -252,7 +252,7 @@ static blk64_t get_midpoint_journal_block(ext2_filsys fs)
 
        group = ext2fs_group_of_blk2(fs, (ext2fs_blocks_count(fs->super) -
                                         fs->super->s_first_data_block) / 2);
-       log_flex = 1 << fs->super->s_log_groups_per_flex;
+       log_flex = 1U << fs->super->s_log_groups_per_flex;
        if (fs->super->s_log_groups_per_flex && (group > log_flex)) {
                group = group & ~(log_flex - 1);
                while ((group < fs->group_desc_count) &&
@@ -524,7 +524,7 @@ errcode_t ext2fs_add_journal_inode3(ext2_filsys fs, struct ext2fs_journal_params
                        retval = ioctl(fd, EXT2_IOC_SETFLAGS, &f);
                        close(fd);
                        if (retval)
-                               return retval;
+                               return errno;
                }
 #endif
 #endif
@@ -604,7 +604,6 @@ errcode_t ext2fs_add_journal_inode2(ext2_filsys fs, blk_t num_blocks,
                                    blk64_t goal, int flags)
 {
        struct ext2fs_journal_params jparams;
-       errcode_t ret;
 
        jparams.num_journal_blocks = num_blocks;
        jparams.num_fc_blocks = 0;