RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-01-13 09:11:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Btrfs-progs: fsck: insert root dir into reloc data tree when reiniting it

Browse Source 
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>
Signed-off-by: David Sterba <dsterba@suse.cz>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Wang Shilong 2014-03-06 13:53:58 +08:00 committed by Chris Mason
parent 1c1e57eb8c
commit 5ec1876c2c
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmds-check.c
View File

@ -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;