diff options
author | Eric Sandeen <sandeen@redhat.com> | 2018-03-26 21:27:31 -0500 |
---|---|---|
committer | Eric Sandeen <sandeen@redhat.com> | 2018-03-26 21:27:31 -0500 |
commit | 4aa3c02fde3547b24707d379f8d994c8e41208c4 (patch) | |
tree | a51cb560a138b5b5082b68469bf53a8cba55231f | |
parent | 9cf846b514ff335470f130d635eff525386bab21 (diff) | |
download | xfsprogs-dev-4aa3c02fde3547b24707d379f8d994c8e41208c4.tar.gz |
metadump/restore: don't use errno after fwrite/fread failures
fread/fwrite don't set errno, so printing out strerror(errno)
after a failure leads to incorrect and confusing messages:
# xfs_mdrestore pre_repair.meta pre_repair.img
xfs_mdrestore: error reading from file: Success
Don't return unset errno from write_index, either.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
-rw-r--r-- | db/metadump.c | 4 | ||||
-rw-r--r-- | mdrestore/xfs_mdrestore.c | 13 |
2 files changed, 8 insertions, 9 deletions
diff --git a/db/metadump.c b/db/metadump.c index 9d62958bb2..d33f9014ff 100644 --- a/db/metadump.c +++ b/db/metadump.c @@ -161,8 +161,8 @@ write_index(void) */ metablock->mb_count = cpu_to_be16(cur_index); if (fwrite(metablock, (cur_index + 1) << BBSHIFT, 1, outf) != 1) { - print_warning("error writing to file: %s", strerror(errno)); - return -errno; + print_warning("error writing to target file"); + return -1; } memset(block_index, 0, num_indices * sizeof(__be64)); diff --git a/mdrestore/xfs_mdrestore.c b/mdrestore/xfs_mdrestore.c index c9d4b0c149..262a385f21 100644 --- a/mdrestore/xfs_mdrestore.c +++ b/mdrestore/xfs_mdrestore.c @@ -93,15 +93,14 @@ perform_restore( block_buffer = (char *)metablock + block_size; if (fread(block_index, block_size - sizeof(struct xfs_metablock), 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); + fatal("error reading from metadump file\n"); if (block_index[0] != 0) fatal("first block is not the primary superblock\n"); - if (fread(block_buffer, mb_count << mbp->mb_blocklog, - 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); + if (fread(block_buffer, mb_count << mbp->mb_blocklog, 1, src_f) != 1) + fatal("error reading from metadump file\n"); libxfs_sb_from_disk(&sb, (xfs_dsb_t *)block_buffer); @@ -157,7 +156,7 @@ perform_restore( break; if (fread(metablock, block_size, 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); + fatal("error reading from metadump file\n"); mb_count = be16_to_cpu(metablock->mb_count); if (mb_count == 0) @@ -167,7 +166,7 @@ perform_restore( if (fread(block_buffer, mb_count << mbp->mb_blocklog, 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); + fatal("error reading from metadump file\n"); bytes_read += block_size + (mb_count << mbp->mb_blocklog); } @@ -253,7 +252,7 @@ main( } if (fread(&mb, sizeof(mb), 1, src_f) != 1) - fatal("error reading from file: %s\n", strerror(errno)); + fatal("error reading from metadump file\n"); if (mb.mb_magic != cpu_to_be32(XFS_MD_MAGIC)) fatal("specified file is not a metadata dump\n"); |