From: Eric Sandeen Date: Tue, 20 Dec 2016 09:23:29 -0600 Subject: [PATCH] libext2fs: don't ignore fsync errors Git-commit: 025d31b17a67953ce96741588bd911e6e66b6e03 References: bsc#1038194 Today, if mke2fs experiences IO errors (say, on a thin device which filled up during mkfs), mke2fs is silent and returns success even though the filesystem was not properly created. Catch errors from the io_channel_flush() callchain to fix this up. Fix formatting of the printed error as well: ... Creating journal (262144 blocks): done Writing superblocks and filesystem accounting information: Warning, had trouble writing out superblocks. # echo $? 5 Signed-off-by: Eric Sandeen Signed-off-by: Theodore Ts'o Acked-by: Jan Kara --- lib/ext2fs/closefs.c | 10 ++++++++-- lib/ext2fs/unix_io.c | 3 ++- misc/mke2fs.c | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) Index: e2fsprogs-1.42.11/lib/ext2fs/closefs.c =================================================================== --- e2fsprogs-1.42.11.orig/lib/ext2fs/closefs.c +++ e2fsprogs-1.42.11/lib/ext2fs/closefs.c @@ -418,16 +418,22 @@ write_primary_superblock_only: ext2fs_swap_super(super_shadow); #endif - if (!(flags & EXT2_FLAG_FLUSH_NO_SYNC)) + if (!(flags & EXT2_FLAG_FLUSH_NO_SYNC)) { retval = io_channel_flush(fs->io); + if (retval) + goto errout; + } retval = write_primary_superblock(fs, super_shadow); if (retval) goto errout; fs->flags &= ~EXT2_FLAG_DIRTY; - if (!(flags & EXT2_FLAG_FLUSH_NO_SYNC)) + if (!(flags & EXT2_FLAG_FLUSH_NO_SYNC)) { retval = io_channel_flush(fs->io); + if (retval) + goto errout; + } errout: fs->super->s_state = fs_state; #ifdef WORDS_BIGENDIAN Index: e2fsprogs-1.42.11/lib/ext2fs/unix_io.c =================================================================== --- e2fsprogs-1.42.11.orig/lib/ext2fs/unix_io.c +++ e2fsprogs-1.42.11/lib/ext2fs/unix_io.c @@ -843,7 +843,8 @@ static errcode_t unix_flush(io_channel c #ifndef NO_IO_CACHE retval = flush_cached_blocks(channel, data, 0); #endif - fsync(data->dev); + if (!retval && fsync(data->dev) != 0) + return errno; return retval; } Index: e2fsprogs-1.42.11/misc/mke2fs.c =================================================================== --- e2fsprogs-1.42.11.orig/misc/mke2fs.c +++ e2fsprogs-1.42.11/misc/mke2fs.c @@ -2925,7 +2925,7 @@ no_journal: retval = ext2fs_close_free(&fs); if (retval) { fprintf(stderr, "%s", - _("\nWarning, had trouble writing out superblocks.")); + _("\nWarning, had trouble writing out superblocks.\n")); } else if (!quiet) { printf("%s", _("done\n\n")); if (!getenv("MKE2FS_SKIP_CHECK_MSG"))