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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 1b319df29eee..86ecca48c604 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -2489,13 +2489,13 @@ static int __must_check submit_one_bio(int rw, struct bio *bio,
2489 return ret; 2489 return ret;
2490} 2490}
2491 2491
2492static int merge_bio(struct extent_io_tree *tree, struct page *page, 2492static int merge_bio(int rw, struct extent_io_tree *tree, struct page *page,
2493 unsigned long offset, size_t size, struct bio *bio, 2493 unsigned long offset, size_t size, struct bio *bio,
2494 unsigned long bio_flags) 2494 unsigned long bio_flags)
2495{ 2495{
2496 int ret = 0; 2496 int ret = 0;
2497 if (tree->ops && tree->ops->merge_bio_hook) 2497 if (tree->ops && tree->ops->merge_bio_hook)
2498 ret = tree->ops->merge_bio_hook(page, offset, size, bio, 2498 ret = tree->ops->merge_bio_hook(rw, page, offset, size, bio,
2499 bio_flags); 2499 bio_flags);
2500 BUG_ON(ret < 0); 2500 BUG_ON(ret < 0);
2501 return ret; 2501 return ret;
@@ -2530,7 +2530,7 @@ static int submit_extent_page(int rw, struct extent_io_tree *tree,
2530 sector; 2530 sector;
2531 2531
2532 if (prev_bio_flags != bio_flags || !contig || 2532 if (prev_bio_flags != bio_flags || !contig ||
2533 merge_bio(tree, page, offset, page_size, bio, bio_flags) || 2533 merge_bio(rw, tree, page, offset, page_size, bio, bio_flags) ||
2534 bio_add_page(bio, page, page_size, offset) < page_size) { 2534 bio_add_page(bio, page, page_size, offset) < page_size) {
2535 ret = submit_one_bio(rw, bio, mirror_num, 2535 ret = submit_one_bio(rw, bio, mirror_num,
2536 prev_bio_flags); 2536 prev_bio_flags);