diff options
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r-- | fs/btrfs/scrub.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 68a5a26997bf..0be77993378e 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
@@ -1343,7 +1343,7 @@ static void scrub_recheck_block(struct btrfs_fs_info *fs_info, | |||
1343 | continue; | 1343 | continue; |
1344 | } | 1344 | } |
1345 | bio->bi_bdev = page->dev->bdev; | 1345 | bio->bi_bdev = page->dev->bdev; |
1346 | bio->bi_sector = page->physical >> 9; | 1346 | bio->bi_iter.bi_sector = page->physical >> 9; |
1347 | 1347 | ||
1348 | bio_add_page(bio, page->page, PAGE_SIZE, 0); | 1348 | bio_add_page(bio, page->page, PAGE_SIZE, 0); |
1349 | if (btrfsic_submit_bio_wait(READ, bio)) | 1349 | if (btrfsic_submit_bio_wait(READ, bio)) |
@@ -1463,7 +1463,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad, | |||
1463 | if (!bio) | 1463 | if (!bio) |
1464 | return -EIO; | 1464 | return -EIO; |
1465 | bio->bi_bdev = page_bad->dev->bdev; | 1465 | bio->bi_bdev = page_bad->dev->bdev; |
1466 | bio->bi_sector = page_bad->physical >> 9; | 1466 | bio->bi_iter.bi_sector = page_bad->physical >> 9; |
1467 | 1467 | ||
1468 | ret = bio_add_page(bio, page_good->page, PAGE_SIZE, 0); | 1468 | ret = bio_add_page(bio, page_good->page, PAGE_SIZE, 0); |
1469 | if (PAGE_SIZE != ret) { | 1469 | if (PAGE_SIZE != ret) { |
@@ -1556,7 +1556,7 @@ again: | |||
1556 | bio->bi_private = sbio; | 1556 | bio->bi_private = sbio; |
1557 | bio->bi_end_io = scrub_wr_bio_end_io; | 1557 | bio->bi_end_io = scrub_wr_bio_end_io; |
1558 | bio->bi_bdev = sbio->dev->bdev; | 1558 | bio->bi_bdev = sbio->dev->bdev; |
1559 | bio->bi_sector = sbio->physical >> 9; | 1559 | bio->bi_iter.bi_sector = sbio->physical >> 9; |
1560 | sbio->err = 0; | 1560 | sbio->err = 0; |
1561 | } else if (sbio->physical + sbio->page_count * PAGE_SIZE != | 1561 | } else if (sbio->physical + sbio->page_count * PAGE_SIZE != |
1562 | spage->physical_for_dev_replace || | 1562 | spage->physical_for_dev_replace || |
@@ -1962,7 +1962,7 @@ again: | |||
1962 | bio->bi_private = sbio; | 1962 | bio->bi_private = sbio; |
1963 | bio->bi_end_io = scrub_bio_end_io; | 1963 | bio->bi_end_io = scrub_bio_end_io; |
1964 | bio->bi_bdev = sbio->dev->bdev; | 1964 | bio->bi_bdev = sbio->dev->bdev; |
1965 | bio->bi_sector = sbio->physical >> 9; | 1965 | bio->bi_iter.bi_sector = sbio->physical >> 9; |
1966 | sbio->err = 0; | 1966 | sbio->err = 0; |
1967 | } else if (sbio->physical + sbio->page_count * PAGE_SIZE != | 1967 | } else if (sbio->physical + sbio->page_count * PAGE_SIZE != |
1968 | spage->physical || | 1968 | spage->physical || |
@@ -3470,8 +3470,8 @@ static int write_page_nocow(struct scrub_ctx *sctx, | |||
3470 | spin_unlock(&sctx->stat_lock); | 3470 | spin_unlock(&sctx->stat_lock); |
3471 | return -ENOMEM; | 3471 | return -ENOMEM; |
3472 | } | 3472 | } |
3473 | bio->bi_size = 0; | 3473 | bio->bi_iter.bi_size = 0; |
3474 | bio->bi_sector = physical_for_dev_replace >> 9; | 3474 | bio->bi_iter.bi_sector = physical_for_dev_replace >> 9; |
3475 | bio->bi_bdev = dev->bdev; | 3475 | bio->bi_bdev = dev->bdev; |
3476 | ret = bio_add_page(bio, page, PAGE_CACHE_SIZE, 0); | 3476 | ret = bio_add_page(bio, page, PAGE_CACHE_SIZE, 0); |
3477 | if (ret != PAGE_CACHE_SIZE) { | 3477 | if (ret != PAGE_CACHE_SIZE) { |