diff options
Diffstat (limited to 'convert/main.c')
-rw-r--r-- | convert/main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/convert/main.c b/convert/main.c index 89f92611..b3ea31d7 100644 --- a/convert/main.c +++ b/convert/main.c @@ -916,9 +916,7 @@ static int make_convert_data_block_groups(struct btrfs_trans_handle *trans, if (ret < 0) break; ret = btrfs_make_block_group(trans, fs_info, 0, - BTRFS_BLOCK_GROUP_DATA, - BTRFS_FIRST_CHUNK_TREE_OBJECTID, - cur, len); + BTRFS_BLOCK_GROUP_DATA, cur, len); if (ret < 0) break; cur += len; @@ -1115,7 +1113,7 @@ static int do_convert(const char *devname, u32 convert_flags, u32 nodesize, goto fail; fd = open(devname, O_RDWR); if (fd < 0) { - error("unable to open %s: %s", devname, strerror(errno)); + error("unable to open %s: %m", devname); goto fail; } btrfs_parse_features_to_string(features_buf, features); @@ -1526,7 +1524,7 @@ static int do_rollback(const char *devname) } fd = open(devname, O_RDWR); if (fd < 0) { - error("unable to open %s: %s", devname, strerror(errno)); + error("unable to open %s: %m", devname); ret = -EIO; goto free_mem; } |