diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 14:31:53 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 13:41:38 -0600 |
| commit | b3d3fa51990599732571bf1a6b1509f7ee887865 (patch) | |
| tree | f8bd362b43686d68c0ddd670d8efe4f20b94b27d /fs/btrfs/inode.c | |
| parent | 37226b2111b0ef7903ceedb8597e2203d7d6dc09 (diff) | |
| download | op-kernel-dev-b3d3fa51990599732571bf1a6b1509f7ee887865.zip op-kernel-dev-b3d3fa51990599732571bf1a6b1509f7ee887865.tar.gz | |
btrfs: update __btrfs_map_block for REQ_OP transition
We no longer pass in a bitmap of rq_flag_bits bits to __btrfs_map_block.
It will always be a REQ_OP, or the btrfs specific REQ_GET_READ_MIRRORS,
so this drops the bit tests.
Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index b4a98c3..8835ce3 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1838,7 +1838,7 @@ int btrfs_merge_bio_hook(int rw, struct page *page, unsigned long offset, length = bio->bi_iter.bi_size; map_length = length; - ret = btrfs_map_block(root->fs_info, rw, logical, + ret = btrfs_map_block(root->fs_info, bio_op(bio), logical, &map_length, NULL, 0); /* Will always return 0 with map_multi == NULL */ BUG_ON(ret < 0); |
