From 11202ec2c80e69d075054802a5e6ddac8b33548a Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 5 Feb 2016 08:34:58 +1100 Subject: [PATCH] libxfs: don't pass negative errnos to strerror() The error negation work in 12b5319 tripped up a little bit when we're reporting errors via strerror(). By negating the error before passing it to strerror, we get i.e. mkfs.xfs: pwrite64 failed: Unknown error -22 Keep the error positive, but return -error, just as we do in the else clauses in these functions. Signed-off-by: Eric Sandeen Reviewed-by: Carlos Maiolino Signed-off-by: Dave Chinner --- libxfs/rdwr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c index 7a0498509..7b23394e3 100644 --- a/libxfs/rdwr.c +++ b/libxfs/rdwr.c @@ -913,12 +913,12 @@ __read_buf(int fd, void *buf, int len, off64_t offset, int flags) sts = pread64(fd, buf, len, offset); if (sts < 0) { - int error = -errno; + int error = errno; fprintf(stderr, _("%s: read failed: %s\n"), progname, strerror(error)); if (flags & LIBXFS_EXIT_ON_FAILURE) exit(1); - return error; + return -error; } else if (sts != len) { fprintf(stderr, _("%s: error - read only %d of %d bytes\n"), progname, sts, len); @@ -1081,12 +1081,12 @@ __write_buf(int fd, void *buf, int len, off64_t offset, int flags) sts = pwrite64(fd, buf, len, offset); if (sts < 0) { - int error = -errno; + int error = errno; fprintf(stderr, _("%s: pwrite64 failed: %s\n"), progname, strerror(error)); if (flags & LIBXFS_B_EXIT) exit(1); - return error; + return -error; } else if (sts != len) { fprintf(stderr, _("%s: error - pwrite64 only %d of %d bytes\n"), progname, sts, len); -- 2.47.2