Skip to content

btrfs-progs: Check metadata mirrors in find-root. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 28, 2011
Merged

btrfs-progs: Check metadata mirrors in find-root. #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion find-root.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ static int find_root(struct btrfs_root *root)
while (1) {
u64 map_length = 4096;
u64 type;
int mirror_num;
int num_copies;

if (offset >
btrfs_super_total_bytes(&root->fs_info->super_copy)) {
Expand All @@ -377,8 +379,10 @@ static int find_root(struct btrfs_root *root)
}
offset = metadata_offset;
}
mirror_num = 1;
again:
err = __btrfs_map_block(&root->fs_info->mapping_tree, READ,
offset, &map_length, &type, &multi, 0);
offset, &map_length, &type, &multi, mirror_num);
if (err) {
offset += map_length;
continue;
Expand All @@ -396,9 +400,16 @@ static int find_root(struct btrfs_root *root)

err = read_physical(root, fd, offset, bytenr, map_length);
if (!err) {
/* Found the root. */
ret = 0;
break;
} else if (err < 0) {
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
offset, map_length);
mirror_num++;
if (mirror_num <= num_copies)
goto again;
/* Unrecoverable error in read. */
ret = err;
break;
}
Expand Down