diff mbox

[3/5] Btrfs-progs: fsck: insert root dir into reloc data tree when reiniting it

Message ID 1394085240-23520-3-git-send-email-wangsl.fnst@cn.fujitsu.com (mailing list archive)
State Accepted, archived
Headers show

Commit Message

Wang Shilong March 6, 2014, 5:53 a.m. UTC 
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 <wangsl.fnst@cn.fujitsu.com>
---
 cmds-check.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/cmds-check.c b/cmds-check.c
index 8a3f2cd..4b2a8f0 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;