btrfs: Remove extent_io_ops::merge_extent_hook callback
authorNikolay Borisov <nborisov@suse.com>
Thu, 1 Nov 2018 12:09:52 +0000 (14:09 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 17 Dec 2018 13:51:28 +0000 (14:51 +0100)
commit5c848198aad3ad1c68309aa7002fa571a540568c
tree5f9cc9ce13e4b236f525d53efb157dd2a06010c7
parenta36bb5f9a90c9bab05b7084d21718450e8067fb0
btrfs: Remove extent_io_ops::merge_extent_hook callback

This callback is used only for data and free space inodes. Such inodes
are guaranteed to have their extent_io_tree::private_data set to the
inode struct. Exploit this fact to directly call the function. Also give
it a more descriptive name. No functional changes.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.h
fs/btrfs/extent_io.c
fs/btrfs/extent_io.h
fs/btrfs/inode.c