RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-25 12:37:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: mkfs: improve error handling in recow_roots

Browse Source 
Return and handle errors in the callchain.

Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2016-08-22 17:55:16 +02:00
parent 0408296c7a
commit fa4559e424
1 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
mkfs.c
View File

@ -190,32 +190,50 @@ err:
return ret; return ret;
} }
static void __recow_root(struct btrfs_trans_handle *trans, static int __recow_root(struct btrfs_trans_handle *trans,
struct btrfs_root *root) struct btrfs_root *root)
{ {
int ret;
struct extent_buffer *tmp; struct extent_buffer *tmp;
int ret;
if (trans->transid != btrfs_root_generation(&root->root_item)) { if (trans->transid != btrfs_root_generation(&root->root_item)) {
extent_buffer_get(root->node); extent_buffer_get(root->node);
ret = __btrfs_cow_block(trans, root, root->node, ret = __btrfs_cow_block(trans, root, root->node,
NULL, 0, &tmp, 0, 0); NULL, 0, &tmp, 0, 0);
BUG_ON(ret); if (ret)
return ret;
free_extent_buffer(tmp); free_extent_buffer(tmp);
} }
return 0;
} }
static void recow_roots(struct btrfs_trans_handle *trans, static int recow_roots(struct btrfs_trans_handle *trans,
struct btrfs_root *root) struct btrfs_root *root)
{ {
struct btrfs_fs_info *info = root->fs_info; struct btrfs_fs_info *info = root->fs_info;
int ret;
__recow_root(trans, info->fs_root); ret = __recow_root(trans, info->fs_root);
__recow_root(trans, info->tree_root); if (ret)
__recow_root(trans, info->extent_root); return ret;
__recow_root(trans, info->chunk_root); ret = __recow_root(trans, info->tree_root);
__recow_root(trans, info->dev_root); if (ret)
__recow_root(trans, info->csum_root); return ret;
ret = __recow_root(trans, info->extent_root);
if (ret)
return ret;
ret = __recow_root(trans, info->chunk_root);
if (ret)
return ret;
ret = __recow_root(trans, info->dev_root);
if (ret)
return ret;
ret = __recow_root(trans, info->csum_root);
if (ret)
return ret;
return 0;
} }
static int create_one_raid_group(struct btrfs_trans_handle *trans, static int create_one_raid_group(struct btrfs_trans_handle *trans,
@ -291,9 +309,9 @@ static int create_raid_groups(struct btrfs_trans_handle *trans,
if (ret) if (ret)
return ret; return ret;
} }
recow_roots(trans, root); ret = recow_roots(trans, root);
return 0; return ret;
} }
static int create_data_reloc_tree(struct btrfs_trans_handle *trans, static int create_data_reloc_tree(struct btrfs_trans_handle *trans,