diff options
| author | Nikolay Borisov <nborisov@suse.com> | 2018-11-01 14:09:52 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-12-17 14:51:28 +0100 |
| commit | 5c848198aad3ad1c68309aa7002fa571a540568c (patch) | |
| tree | 5f9cc9ce13e4b236f525d53efb157dd2a06010c7 /fs/btrfs/ctree.h | |
| parent | a36bb5f9a90c9bab05b7084d21718450e8067fb0 (diff) | |
| download | linux-stable-5c848198aad3ad1c68309aa7002fa571a540568c.tar.gz linux-stable-5c848198aad3ad1c68309aa7002fa571a540568c.tar.bz2 linux-stable-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/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index 18ed4643cde1..a75887d1fe3f 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3154,6 +3154,8 @@ void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state, unsigned *bits); void btrfs_clear_delalloc_extent(struct inode *inode, struct extent_state *state, unsigned *bits); +void btrfs_merge_delalloc_extent(struct inode *inode, struct extent_state *new, + struct extent_state *other); int btrfs_merge_bio_hook(struct page *page, unsigned long offset, size_t size, struct bio *bio, unsigned long bio_flags); |