diff options
author | Nikolay Borisov <nborisov@suse.com> | 2018-11-01 14:09:50 +0200 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-12-17 14:51:28 +0100 |
commit | e06a1fc99cc7eca09118cc02c4d7540fa69e9d09 (patch) | |
tree | 3a628c775a371dc6b4387cdaa17d701193c45263 /fs/btrfs/ctree.h | |
parent | 65a680f6b7d6e83ca3a440588d3581f4a38265bf (diff) | |
download | linux-stable-e06a1fc99cc7eca09118cc02c4d7540fa69e9d09.tar.gz linux-stable-e06a1fc99cc7eca09118cc02c4d7540fa69e9d09.tar.bz2 linux-stable-e06a1fc99cc7eca09118cc02c4d7540fa69e9d09.zip |
btrfs: Remove extent_io_ops::set_bit_hook extent_io callback
This callback is used to properly account delalloc extents for data
inodes (ordinary file inodes and freespace v1 inodes). Those can be
easily identified since they have their extent_io trees ->private_data
member point to the inode. Let's exploit this fact to remove the
needless indirection through extent_io_hooks and directly call the
function. Also give the function a name which reflects its purpose -
btrfs_set_delalloc_extent.
This patch also modified test_find_delalloc so that the extent_io_tree
used for testing doesn't have its ->private_data set which would have
caused a crash in btrfs_set_delalloc_extent due to the btrfs_inode->root
member not being initialised. The old version of the code also didn't
call set_bit_hook since the extent_io ops weren't set for the inode. 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 edcbca9cd813..9a0e4e1c59ea 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -3150,6 +3150,8 @@ int btrfs_create_subvol_root(struct btrfs_trans_handle *trans, struct btrfs_root *new_root, struct btrfs_root *parent_root, u64 new_dirid); +void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state, + unsigned *bits); int btrfs_merge_bio_hook(struct page *page, unsigned long offset, size_t size, struct bio *bio, unsigned long bio_flags); |