diff options
| author | David Sterba | 2018-07-18 19:23:45 +0200 |
|---|---|---|
| committer | David Sterba | 2018-08-06 13:12:55 +0200 |
| commit | 05912a3c04ebca217507b4323b679c60eda4ac11 (patch) | |
| tree | 280659829e3bf63ff6f7c412f4598c30dc218294 /fs/btrfs/extent_io.c | |
| parent | btrfs: unify end_io callbacks of async_submit_bio (diff) | |
| download | kernel-qcow2-linux-05912a3c04ebca217507b4323b679c60eda4ac11.tar.gz kernel-qcow2-linux-05912a3c04ebca217507b4323b679c60eda4ac11.tar.xz kernel-qcow2-linux-05912a3c04ebca217507b4323b679c60eda4ac11.zip | |
btrfs: drop extent_io_ops::tree_fs_info callback
All implementations of the callback are trivial and do the same and
there's only one user. Merge everything together.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/extent_io.c')
| -rw-r--r-- | fs/btrfs/extent_io.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c index 3440053f3599..7a19437c6eda 100644 --- a/fs/btrfs/extent_io.c +++ b/fs/btrfs/extent_io.c @@ -140,14 +140,6 @@ static int add_extent_changeset(struct extent_state *state, unsigned bits, static void flush_write_bio(struct extent_page_data *epd); -static inline struct btrfs_fs_info * -tree_fs_info(struct extent_io_tree *tree) -{ - if (tree->ops) - return tree->ops->tree_fs_info(tree->private_data); - return NULL; -} - int __init extent_io_init(void) { extent_state_cache = kmem_cache_create("btrfs_extent_state", @@ -564,8 +556,10 @@ alloc_extent_state_atomic(struct extent_state *prealloc) static void extent_io_tree_panic(struct extent_io_tree *tree, int err) { - btrfs_panic(tree_fs_info(tree), err, - "Locking error: Extent tree was modified by another thread while locked."); + struct inode *inode = tree->private_data; + + btrfs_panic(btrfs_sb(inode->i_sb), err, + "locking error: extent tree was modified by another thread while locked"); } /* |