From 764c8dea725763dcd0fde61bd547625769ec66f3 Mon Sep 17 00:00:00 2001 From: Su Yue Date: Wed, 18 Dec 2019 13:18:40 +0800 Subject: [PATCH] btrfs-progs: handle error if btrfs_write_one_block_group() failed Just break loop and return the error code if failed. Functions in the call chain are able to handle it. Reviewed-by: Qu Wenruo Signed-off-by: Su Yue Signed-off-by: David Sterba --- extent-tree.c | 4 +++- transaction.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/extent-tree.c b/extent-tree.c index 7ba80375..714b03a7 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -1596,9 +1596,11 @@ int btrfs_write_dirty_block_groups(struct btrfs_trans_handle *trans) cache = (struct btrfs_block_group_cache *)(unsigned long)ptr; ret = write_one_cache_group(trans, path, cache); + if (ret) + break; } btrfs_free_path(path); - return 0; + return ret; } static struct btrfs_space_info *__find_space_info(struct btrfs_fs_info *info, diff --git a/transaction.c b/transaction.c index 45bb9e1f..c9035c76 100644 --- a/transaction.c +++ b/transaction.c @@ -77,7 +77,9 @@ static int update_cowonly_root(struct btrfs_trans_handle *trans, &root->root_item); if (ret < 0) return ret; - btrfs_write_dirty_block_groups(trans); + ret = btrfs_write_dirty_block_groups(trans); + if (ret) + return ret; } return 0; }