summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/scrub.c
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.com>2018-06-29 04:56:53 -0400
committerDavid Sterba <dsterba@suse.com>2018-08-06 07:12:44 -0400
commitebcc326316f3d798e9715e5ca1451c3e457b95dd (patch)
treef008663fb73aa369b9b1e79a45f09819bdf7b1a3 /fs/btrfs/scrub.c
parentcc5e31a4775d0d6b98139fdee51868a270bda42f (diff)
btrfs: open-code bio_set_op_attrs
The helper is trivial and marked as deprecated. Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
-rw-r--r--fs/btrfs/scrub.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 67bb003323e7..bf4f262f9a52 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1842,7 +1842,7 @@ static int scrub_repair_page_from_good_copy(struct scrub_block *sblock_bad,
1842 bio = btrfs_io_bio_alloc(1); 1842 bio = btrfs_io_bio_alloc(1);
1843 bio_set_dev(bio, page_bad->dev->bdev); 1843 bio_set_dev(bio, page_bad->dev->bdev);
1844 bio->bi_iter.bi_sector = page_bad->physical >> 9; 1844 bio->bi_iter.bi_sector = page_bad->physical >> 9;
1845 bio_set_op_attrs(bio, REQ_OP_WRITE, 0); 1845 bio->bi_opf = REQ_OP_WRITE;
1846 1846
1847 ret = bio_add_page(bio, page_good->page, PAGE_SIZE, 0); 1847 ret = bio_add_page(bio, page_good->page, PAGE_SIZE, 0);
1848 if (PAGE_SIZE != ret) { 1848 if (PAGE_SIZE != ret) {
@@ -1937,7 +1937,7 @@ again:
1937 bio->bi_end_io = scrub_wr_bio_end_io; 1937 bio->bi_end_io = scrub_wr_bio_end_io;
1938 bio_set_dev(bio, sbio->dev->bdev); 1938 bio_set_dev(bio, sbio->dev->bdev);
1939 bio->bi_iter.bi_sector = sbio->physical >> 9; 1939 bio->bi_iter.bi_sector = sbio->physical >> 9;
1940 bio_set_op_attrs(bio, REQ_OP_WRITE, 0); 1940 bio->bi_opf = REQ_OP_WRITE;
1941 sbio->status = 0; 1941 sbio->status = 0;
1942 } else if (sbio->physical + sbio->page_count * PAGE_SIZE != 1942 } else if (sbio->physical + sbio->page_count * PAGE_SIZE !=
1943 spage->physical_for_dev_replace || 1943 spage->physical_for_dev_replace ||
@@ -2337,7 +2337,7 @@ again:
2337 bio->bi_end_io = scrub_bio_end_io; 2337 bio->bi_end_io = scrub_bio_end_io;
2338 bio_set_dev(bio, sbio->dev->bdev); 2338 bio_set_dev(bio, sbio->dev->bdev);
2339 bio->bi_iter.bi_sector = sbio->physical >> 9; 2339 bio->bi_iter.bi_sector = sbio->physical >> 9;
2340 bio_set_op_attrs(bio, REQ_OP_READ, 0); 2340 bio->bi_opf = REQ_OP_READ;
2341 sbio->status = 0; 2341 sbio->status = 0;
2342 } else if (sbio->physical + sbio->page_count * PAGE_SIZE != 2342 } else if (sbio->physical + sbio->page_count * PAGE_SIZE !=
2343 spage->physical || 2343 spage->physical ||