Skip to content

Fixes for my Raid10 restore issues. #3

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 10, 2011
Merged

Fixes for my Raid10 restore issues. #3

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
11 changes: 7 additions & 4 deletions restore.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
int compress;
int ret;
int dev_fd;
int mirror_num = 0;
int mirror_num = 1;
int num_copies;

compress = btrfs_file_extent_compression(leaf, fi);
Expand Down Expand Up @@ -240,14 +240,15 @@ static int copy_one_extent(struct btrfs_root *root, int fd,

if (size_left < length)
length = size_left;
size_left -= length;

done = pread(dev_fd, inbuf+count, length, dev_bytenr);
if (done < length) {
/* Need both checks, or we miss negative values due to u64 conversion */
if (done < 0 || done < length) {
num_copies = btrfs_num_copies(&root->fs_info->mapping_tree,
bytenr, length);
mirror_num++;
if (mirror_num >= num_copies) {
/* mirror_num is 1-indexed, so num_copies is a valid mirror. */
if (mirror_num > num_copies) {
ret = -1;
fprintf(stderr, "Exhausted mirrors trying to read\n");
goto out;
Expand All @@ -256,6 +257,8 @@ static int copy_one_extent(struct btrfs_root *root, int fd,
goto again;
}

mirror_num = 1;
size_left -= length;
count += length;
bytenr += length;
if (size_left)
Expand Down