diff options
Diffstat (limited to 'mkfs')
| -rw-r--r-- | mkfs/common.c | 4 | ||||
| -rw-r--r-- | mkfs/main.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/mkfs/common.c b/mkfs/common.c index 8e85942e..16916ca2 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -713,11 +713,11 @@ int test_dev_for_mkfs(const char *file, int force_overwrite) /* check if the device is busy */ fd = open(file, O_RDWR|O_EXCL); if (fd < 0) { - error("unable to open %s: %s", file, strerror(errno)); + error("unable to open %s: %m", file); return 1; } if (fstat(fd, &st)) { - error("unable to stat %s: %s", file, strerror(errno)); + error("unable to stat %s: %m", file); close(fd); return 1; } diff --git a/mkfs/main.c b/mkfs/main.c index 9bb1f602..e376cd03 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -985,12 +985,13 @@ int main(int argc, char **argv) fd = open(file, oflags, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH); if (fd < 0) { - error("unable to open %s: %s", file, strerror(errno)); + error("unable to open %s: %m", file); goto error; } + ret = fstat(fd, &statbuf); if (ret < 0) { - error("unable to stat %s: %s", file, strerror(errno)); + error("unable to stat %s: %m", file); ret = -errno; goto error; } @@ -1029,8 +1030,7 @@ int main(int argc, char **argv) path = argv[i]; ret = test_minimum_size(path, min_dev_size); if (ret < 0) { - error("failed to check size for %s: %s", - path, strerror(-ret)); + error("failed to check size for %s: %m", path); goto error; } if (ret > 0) { @@ -1055,7 +1055,7 @@ int main(int argc, char **argv) */ fd = open(file, O_RDWR); if (fd < 0) { - error("unable to open %s: %s", file, strerror(errno)); + error("unable to open %s: %m", file); goto error; } ret = btrfs_prepare_device(fd, file, &dev_block_count, block_count, @@ -1157,7 +1157,7 @@ int main(int argc, char **argv) */ fd = open(file, O_RDWR); if (fd < 0) { - error("unable to open %s: %s", file, strerror(errno)); + error("unable to open %s: %m", file); goto error; } ret = btrfs_device_already_in_root(root, fd, |