mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-25 02:09:42 +00:00
Btrfs: record error if one block has failed to retry
In the nocsum case of dio read endio, it returns immediately if an error gets returned when repairing, which leaves the rest blocks unrepaired. The behavior is different from how buffered read endio works in the same case. This changes it to record error only and go on repairing the rest blocks. Signed-off-by: Liu Bo <bo.li.liu@oracle.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
17347cec15
commit
629ebf4fad
1 changed files with 7 additions and 3 deletions
|
@ -8078,6 +8078,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
|
|||
u32 sectorsize;
|
||||
int nr_sectors;
|
||||
int ret;
|
||||
int err = 0;
|
||||
|
||||
fs_info = BTRFS_I(inode)->root->fs_info;
|
||||
sectorsize = fs_info->sectorsize;
|
||||
|
@ -8099,8 +8100,10 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
|
|||
pgoff, start, start + sectorsize - 1,
|
||||
io_bio->mirror_num,
|
||||
btrfs_retry_endio_nocsum, &done);
|
||||
if (ret)
|
||||
return ret;
|
||||
if (ret) {
|
||||
err = ret;
|
||||
goto next;
|
||||
}
|
||||
|
||||
wait_for_completion(&done.done);
|
||||
|
||||
|
@ -8109,6 +8112,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
|
|||
goto next_block_or_try_again;
|
||||
}
|
||||
|
||||
next:
|
||||
start += sectorsize;
|
||||
|
||||
nr_sectors--;
|
||||
|
@ -8119,7 +8123,7 @@ static int __btrfs_correct_data_nocsum(struct inode *inode,
|
|||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return err;
|
||||
}
|
||||
|
||||
static void btrfs_retry_endio(struct bio *bio)
|
||||
|
|
Loading…
Reference in a new issue