diff options
author | David Sterba <dsterba@suse.com> | 2018-07-18 19:28:09 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-08-06 13:12:56 +0200 |
commit | 00032d38eaa89c76de7d9c1ae6de8c48c14edd74 (patch) | |
tree | 5bc41e418c14cd74ccf1ec5e80eaa4308aab9d3e /fs/btrfs/inode.c | |
parent | 05912a3c04ebca217507b4323b679c60eda4ac11 (diff) | |
download | linux-stable-00032d38eaa89c76de7d9c1ae6de8c48c14edd74.tar.gz linux-stable-00032d38eaa89c76de7d9c1ae6de8c48c14edd74.tar.bz2 linux-stable-00032d38eaa89c76de7d9c1ae6de8c48c14edd74.zip |
btrfs: drop extent_io_ops::merge_bio_hook callback
The data and metadata callback implementation both use the same
function. We can remove the call indirection completely.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/inode.c')
-rw-r--r-- | fs/btrfs/inode.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index f279e380f36e..a72784d5666f 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -1898,8 +1898,8 @@ static void btrfs_clear_bit_hook(void *private_data, } /* - * extent_io.c merge_bio_hook, this must check the chunk tree to make sure - * we don't create bios that span stripes or chunks + * Merge bio hook, this must check the chunk tree to make sure we don't create + * bios that span stripes or chunks * * return 1 if page cannot be merged to bio * return 0 if page can be merged to bio @@ -10545,7 +10545,6 @@ static const struct extent_io_ops btrfs_extent_io_ops = { /* mandatory callbacks */ .submit_bio_hook = btrfs_submit_bio_hook, .readpage_end_io_hook = btrfs_readpage_end_io_hook, - .merge_bio_hook = btrfs_merge_bio_hook, .readpage_io_failed_hook = btrfs_readpage_io_failed_hook, .set_range_writeback = btrfs_set_range_writeback, |