From 5ec1876c2c7b9495723053e9b4c85adf24821331 Mon Sep 17 00:00:00 2001 From: Wang Shilong Date: Thu, 6 Mar 2014 13:53:58 +0800 Subject: Btrfs-progs: fsck: insert root dir into reloc data tree when reiniting it There are two bugs when resetting balance: 1.we will skip reinitting reloc data tree if no reloc root found, however this is not right because we don't pin reloc data tree before. 2.we should insert root dir into reloc data tree,otherwise we will fail to fsck. Fix problems by forcely reiniting reloc data root and inserting root dir. Signed-off-by: Wang Shilong Signed-off-by: David Sterba Signed-off-by: Chris Mason --- cmds-check.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cmds-check.c b/cmds-check.c index 8a3f2cd6..4b2a8f01 100644 --- a/cmds-check.c +++ b/cmds-check.c @@ -6128,7 +6128,10 @@ static int reset_balance(struct btrfs_trans_handle *trans, if (ret) { if (ret > 0) ret = 0; - goto out; + if (!ret) + goto reinit_data_reloc; + else + goto out; } ret = btrfs_del_item(trans, root, path); @@ -6190,6 +6193,7 @@ static int reset_balance(struct btrfs_trans_handle *trans, } btrfs_release_path(path); +reinit_data_reloc: key.objectid = BTRFS_DATA_RELOC_TREE_OBJECTID; key.type = BTRFS_ROOT_ITEM_KEY; key.offset = (u64)-1; @@ -6205,6 +6209,9 @@ static int reset_balance(struct btrfs_trans_handle *trans, extent_buffer_get(root->node); } ret = btrfs_fsck_reinit_root(trans, root, 0); + if (ret) + goto out; + ret = btrfs_make_root_dir(trans, root, BTRFS_FIRST_FREE_OBJECTID); out: btrfs_free_path(path); return ret; -- cgit v1.2.3