RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-02-16 09:46:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: convert: use message helpers for error messages

Browse Source 
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2022-09-19 12:17:19 +02:00
parent b19ab3ba9f
commit b610fc1612
3 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
convert/main.c
View File

@ -1102,7 +1102,7 @@ static int migrate_super_block(int fd, u64 old_bytenr)
len = BTRFS_SUPER_INFO_SIZE;
ret = pwrite(fd, &super, len, bytenr);
if (ret != len) {
fprintf(stderr, "unable to zero fill device\n");
error("unable to zero fill device");
break;
}
bytenr += len;

22
convert/source-ext2.c
View File

@ -48,7 +48,7 @@ static int ext2_open_fs(struct btrfs_convert_context *cctx, const char *name)
ret = ext2fs_open(name, open_flag, 0, 0, unix_io_manager, &ext2_fs);
if (ret) {
if (ret != EXT2_ET_BAD_MAGIC)
fprintf(stderr, "ext2fs_open: %s\n", error_message(ret));
error("ext2fs_open: %s", error_message(ret));
return -1;
}
@ -71,14 +71,12 @@ static int ext2_open_fs(struct btrfs_convert_context *cctx, const char *name)
}
ret = ext2fs_read_inode_bitmap(ext2_fs);
if (ret) {
fprintf(stderr, "ext2fs_read_inode_bitmap: %s\n",
error_message(ret));
error("ext2fs_read_inode_bitmap: %s", error_message(ret));
goto fail;
}
ret = ext2fs_read_block_bitmap(ext2_fs);
if (ret) {
fprintf(stderr, "ext2fs_read_block_bitmap: %s\n",
error_message(ret));
error("ext2fs_read_block_bitmap: %s", error_message(ret));
goto fail;
}
/*
@ -278,7 +276,7 @@ static int ext2_create_dir_entries(struct btrfs_trans_handle *trans,
}
return ret;
error:
fprintf(stderr, "ext2fs_dir_iterate2: %s\n", error_message(err));
error("ext2fs_dir_iterate2: %s", error_message(err));
return -1;
}
@ -361,7 +359,7 @@ fail:
free(buffer);
return ret;
error:
fprintf(stderr, "ext2fs_block_iterate2: %s\n", error_message(err));
error("ext2fs_block_iterate2: %s", error_message(err));
return -1;
}
@ -538,7 +536,7 @@ static int ext2_copy_single_xattr(struct btrfs_trans_handle *trans,
strncat(namebuf, EXT2_EXT_ATTR_NAME(entry), entry->e_name_len);
if (name_len + datalen > BTRFS_LEAF_DATA_SIZE(root->fs_info) -
sizeof(struct btrfs_item) - sizeof(struct btrfs_dir_item)) {
fprintf(stderr, "skip large xattr on inode %llu name %.*s\n",
error("skip large xattr on inode %llu name %.*s",
objectid - INO_OFFSET, name_len, namebuf);
goto out;
}
@ -576,8 +574,7 @@ static int ext2_copy_extended_attrs(struct btrfs_trans_handle *trans,
err = ext2fs_read_inode_full(ext2_fs, ext2_ino, (void *)ext2_inode,
inode_size);
if (err) {
fprintf(stderr, "ext2fs_read_inode_full: %s\n",
error_message(err));
error("ext2fs_read_inode_full: %s", error_message(err));
ret = -1;
goto out;
}
@ -628,8 +625,7 @@ static int ext2_copy_extended_attrs(struct btrfs_trans_handle *trans,
}
err = ext2fs_read_ext_attr2(ext2_fs, ext2_inode->i_file_acl, buffer);
if (err) {
fprintf(stderr, "ext2fs_read_ext_attr2: %s\n",
error_message(err));
error("ext2fs_read_ext_attr2: %s", error_message(err));
ret = -1;
goto out;
}
@ -752,7 +748,7 @@ static int ext4_copy_inode_timespec_extra(struct btrfs_inode_item *dst,
err = ext2fs_read_inode_full(ext2_fs, ext2_ino, (void *)src,
s_inode_size);
if (err) {
fprintf(stderr, "ext2fs_read_inode_full: %s\n", error_message(err));
error("ext2fs_read_inode_full: %s", error_message(err));
ret = -1;
goto out;
}

7
convert/source-reiserfs.c
View File

@ -688,7 +688,7 @@ static int reiserfs_xattr_indirect_fn(reiserfs_filsys_t fs, u64 position,
if (size > BTRFS_LEAF_DATA_SIZE(xa_data->root->fs_info) -
sizeof(struct btrfs_item) - sizeof(struct btrfs_dir_item)) {
fprintf(stderr, "skip large xattr on objectid %llu name %.*s\n",
error("skip large xattr on objectid %llu name %.*s",
xa_data->target_oid, (int)xa_data->namelen,
xa_data->name);
return -E2BIG;
@ -726,7 +726,7 @@ static int reiserfs_xattr_direct_fn(reiserfs_filsys_t fs, __u64 position,
if (size > BTRFS_LEAF_DATA_SIZE(xa_data->root->fs_info) -
sizeof(struct btrfs_item) - sizeof(struct btrfs_dir_item)) {
fprintf(stderr, "skip large xattr on objectid %llu name %.*s\n",
error("skip large xattr on objectid %llu name %.*s",
xa_data->target_oid, (int)xa_data->namelen,
xa_data->name);
return -E2BIG;
@ -819,8 +819,7 @@ static int reiserfs_copy_one_xattr(reiserfs_filsys_t fs,
goto out;
if (!reiserfs_check_xattr(xa_data->body, xa_data->len)) {
fprintf(stderr,
"skip corrupted xattr on objectid %u name %.*s\n",
error("skip corrupted xattr on objectid %u name %.*s",
deh_objectid, (int)xa_data->namelen,
xa_data->name);
goto out;