aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r--fs/btrfs/inode.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 67ed24ae86bb..1b98c4ce3c6f 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1566,7 +1566,7 @@ static void btrfs_clear_bit_hook(struct inode *inode,
1566 * extent_io.c merge_bio_hook, this must check the chunk tree to make sure 1566 * extent_io.c merge_bio_hook, this must check the chunk tree to make sure
1567 * we don't create bios that span stripes or chunks 1567 * we don't create bios that span stripes or chunks
1568 */ 1568 */
1569int btrfs_merge_bio_hook(struct page *page, unsigned long offset, 1569int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset,
1570 size_t size, struct bio *bio, 1570 size_t size, struct bio *bio,
1571 unsigned long bio_flags) 1571 unsigned long bio_flags)
1572{ 1572{
@@ -1581,7 +1581,7 @@ int btrfs_merge_bio_hook(struct page *page, unsigned long offset,
1581 1581
1582 length = bio->bi_size; 1582 length = bio->bi_size;
1583 map_length = length; 1583 map_length = length;
1584 ret = btrfs_map_block(root->fs_info, READ, logical, 1584 ret = btrfs_map_block(root->fs_info, rw, logical,
1585 &map_length, NULL, 0); 1585 &map_length, NULL, 0);
1586 /* Will always return 0 with map_multi == NULL */ 1586 /* Will always return 0 with map_multi == NULL */
1587 BUG_ON(ret < 0); 1587 BUG_ON(ret < 0);