Josef Bacik
2013-Dec-11 16:17 UTC
[PATCH] Btrfs-progs: reset balance before reiniting extent root
When we re-init the extent root we make it completely empty, so when we reset a
pending balance we will fail to find refs for any blocks we may cow, which will
result in errors and we will exit out. We need to reset the balance first so
the normal cow stuff doesn''t freak out and then we can re-init the
extent tree.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fb.com>
---
cmds-check.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmds-check.c b/cmds-check.c
index b27154f..7f07d3b 100644
--- a/cmds-check.c
+++ b/cmds-check.c
@@ -5931,6 +5931,12 @@ static int reinit_extent_tree(struct btrfs_fs_info
*fs_info)
return ret;
}
+ ret = reset_balance(trans, fs_info);
+ if (ret) {
+ fprintf(stderr, "error reseting the pending balance\n");
+ return ret;
+ }
+
/* Ok we can allocate now, reinit the extent root */
ret = btrfs_fsck_reinit_root(trans, fs_info->extent_root, 0);
if (ret) {
@@ -5943,12 +5949,6 @@ static int reinit_extent_tree(struct btrfs_fs_info
*fs_info)
return ret;
}
- ret = reset_balance(trans, fs_info);
- if (ret) {
- fprintf(stderr, "error reseting the pending balance\n");
- return ret;
- }
-
/*
* Now we have all the in-memory block groups setup so we can make
* allocations properly, and the metadata we care about is safe since we
--
1.8.3.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html