aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/extent_io.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/extent_io.c')
-rw-r--r--fs/btrfs/extent_io.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index c191ea58750f..74d47e197ca0 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -1997,7 +1997,7 @@ static int free_io_failure(struct inode *inode, struct io_failure_record *rec)
1997 */ 1997 */
1998int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start, 1998int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start,
1999 u64 length, u64 logical, struct page *page, 1999 u64 length, u64 logical, struct page *page,
2000 int mirror_num) 2000 unsigned int pg_offset, int mirror_num)
2001{ 2001{
2002 struct bio *bio; 2002 struct bio *bio;
2003 struct btrfs_device *dev; 2003 struct btrfs_device *dev;
@@ -2036,7 +2036,7 @@ int repair_io_failure(struct btrfs_fs_info *fs_info, u64 start,
2036 return -EIO; 2036 return -EIO;
2037 } 2037 }
2038 bio->bi_bdev = dev->bdev; 2038 bio->bi_bdev = dev->bdev;
2039 bio_add_page(bio, page, length, start - page_offset(page)); 2039 bio_add_page(bio, page, length, pg_offset);
2040 2040
2041 if (btrfsic_submit_bio_wait(WRITE_SYNC, bio)) { 2041 if (btrfsic_submit_bio_wait(WRITE_SYNC, bio)) {
2042 /* try to remap that extent elsewhere? */ 2042 /* try to remap that extent elsewhere? */
@@ -2067,7 +2067,8 @@ int repair_eb_io_failure(struct btrfs_root *root, struct extent_buffer *eb,
2067 for (i = 0; i < num_pages; i++) { 2067 for (i = 0; i < num_pages; i++) {
2068 struct page *p = extent_buffer_page(eb, i); 2068 struct page *p = extent_buffer_page(eb, i);
2069 ret = repair_io_failure(root->fs_info, start, PAGE_CACHE_SIZE, 2069 ret = repair_io_failure(root->fs_info, start, PAGE_CACHE_SIZE,
2070 start, p, mirror_num); 2070 start, p, start - page_offset(p),
2071 mirror_num);
2071 if (ret) 2072 if (ret)
2072 break; 2073 break;
2073 start += PAGE_CACHE_SIZE; 2074 start += PAGE_CACHE_SIZE;
@@ -2127,6 +2128,7 @@ static int clean_io_failure(u64 start, struct page *page)
2127 if (num_copies > 1) { 2128 if (num_copies > 1) {
2128 repair_io_failure(fs_info, start, failrec->len, 2129 repair_io_failure(fs_info, start, failrec->len,
2129 failrec->logical, page, 2130 failrec->logical, page,
2131 start - page_offset(page),
2130 failrec->failed_mirror); 2132 failrec->failed_mirror);
2131 } 2133 }
2132 } 2134 }