diff options
| author | David Sterba <dsterba@suse.com> | 2018-10-25 14:10:54 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-10-31 18:24:14 +0100 |
| commit | e578b59bf612178d7727c303102049e62676c308 (patch) | |
| tree | a6d6edd7fb6f34f4ce753aa9a1d787198a0e1ddf /mkfs | |
| parent | d59e19ca0786be2b415ca342b0fab5f222ecb702 (diff) | |
btrfs-progs: convert strerror to implicit %m
Similar to the changes where strerror(errno) was converted, continue
with the remaining cases where the argument was stored in another
variable.
The savings in object size are about 4500 bytes:
$ size btrfs.old btrfs.new
text data bss dec hex filename
805055 24248 19748 849051 cf49b btrfs.old
804527 24248 19748 848523 cf28b btrfs.new
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'mkfs')
| -rw-r--r-- | mkfs/common.c | 7 | ||||
| -rw-r--r-- | mkfs/main.c | 3 | ||||
| -rw-r--r-- | mkfs/rootdir.c | 20 |
3 files changed, 17 insertions, 13 deletions
diff --git a/mkfs/common.c b/mkfs/common.c index 0ace262b..f7e3badc 100644 --- a/mkfs/common.c +++ b/mkfs/common.c @@ -714,7 +714,8 @@ int test_dev_for_mkfs(const char *file, int force_overwrite) ret = is_swap_device(file); if (ret < 0) { - error("checking status of %s: %s", file, strerror(-ret)); + errno = -ret; + error("checking status of %s: %m", file); return 1; } if (ret == 1) { @@ -760,8 +761,8 @@ int test_status_for_mkfs(const char *file, bool force_overwrite) } ret = check_mounted(file); if (ret < 0) { - error("cannot check mount status of %s: %s", file, - strerror(-ret)); + errno = -ret; + error("cannot check mount status of %s: %m", file); return 1; } if (ret == 1) { diff --git a/mkfs/main.c b/mkfs/main.c index b76462a7..b6748f7f 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1094,7 +1094,8 @@ int main(int argc, char **argv) ret = make_btrfs(fd, &mkfs_cfg); if (ret) { - error("error during mkfs: %s", strerror(-ret)); + errno = -ret; + error("error during mkfs: %m"); goto error; } diff --git a/mkfs/rootdir.c b/mkfs/rootdir.c index 74c46241..8384a151 100644 --- a/mkfs/rootdir.c +++ b/mkfs/rootdir.c @@ -261,8 +261,9 @@ static int add_xattr_item(struct btrfs_trans_handle *trans, cur_name_len, cur_value, ret, objectid); if (ret) { - error("inserting a xattr item failed for %s: %s", - file_name, strerror(-ret)); + errno = -ret; + error("inserting a xattr item failed for %s: %m", + file_name); } cur_name = strtok(next_location, &delimiter); @@ -858,8 +859,8 @@ static int set_device_size(struct btrfs_fs_info *fs_info, trans = btrfs_start_transaction(chunk_root, 1); if (IS_ERR(trans)) { ret = PTR_ERR(trans); - error("failed to start transaction: %d (%s)", ret, - strerror(-ret)); + errno = -ret; + error("failed to start transaction: %d (%m)", ret); return ret; } key.objectid = BTRFS_DEV_ITEMS_OBJECTID; @@ -887,9 +888,10 @@ static int set_device_size(struct btrfs_fs_info *fs_info, * super->dev_item */ ret = btrfs_commit_transaction(trans, chunk_root); - if (ret < 0) - error("failed to commit current transaction: %d (%s)", - ret, strerror(-ret)); + if (ret < 0) { + errno = -ret; + error("failed to commit current transaction: %d (%m)", ret); + } btrfs_release_path(&path); return ret; @@ -924,8 +926,8 @@ int btrfs_mkfs_shrink_fs(struct btrfs_fs_info *fs_info, u64 *new_size_ret, ret = get_device_extent_end(fs_info, 1, &new_size); if (ret < 0) { - error("failed to get minimal device size: %d (%s)", - ret, strerror(-ret)); + errno = -ret; + error("failed to get minimal device size: %d (%m)", ret); return ret; } |