diff options
author | Nikolay Borisov <nborisov@suse.com> | 2018-11-01 13:09:52 +0100 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-12-17 14:51:28 +0100 |
commit | 5c848198aad3ad1c68309aa7002fa571a540568c (patch) | |
tree | 5f9cc9ce13e4b236f525d53efb157dd2a06010c7 /fs/btrfs/extent_io.h | |
parent | btrfs: Remove extent_io_ops::clear_bit_hook callback (diff) | |
download | linux-5c848198aad3ad1c68309aa7002fa571a540568c.tar.xz linux-5c848198aad3ad1c68309aa7002fa571a540568c.zip |
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>
Diffstat (limited to 'fs/btrfs/extent_io.h')
-rw-r--r-- | fs/btrfs/extent_io.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/btrfs/extent_io.h b/fs/btrfs/extent_io.h index a3a3302f3625..7d181a378d90 100644 --- a/fs/btrfs/extent_io.h +++ b/fs/btrfs/extent_io.h @@ -106,9 +106,6 @@ struct extent_io_ops { /* * Optional hooks, called if the pointer is not NULL */ - void (*merge_extent_hook)(void *private_data, - struct extent_state *new, - struct extent_state *other); void (*split_extent_hook)(void *private_data, struct extent_state *orig, u64 split); }; |