On 29.11.19 г. 11:38 ч., Nikolay Borisov wrote:
> It's a simple wrapper over btrfs_panic and is called only once. Just
> open code it.
>
> Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx>
> ---
> fs/btrfs/extent-tree.c | 5 +----
> fs/btrfs/ordered-data.c | 10 +---------
> 2 files changed, 2 insertions(+), 13 deletions(-)
>
> diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c
> index f68b38f44f0b..ab99ec6e188b 100644
> --- a/fs/btrfs/extent-tree.c
> +++ b/fs/btrfs/extent-tree.c
> @@ -4172,11 +4172,8 @@ int btrfs_free_reserved_extent(struct btrfs_fs_info *fs_info,
> struct btrfs_block_group *cache;
>
> cache = btrfs_lookup_block_group(fs_info, start);
> - if (!cache) {
> - btrfs_err(fs_info, "Unable to find block group for %llu",
> - start);
> + if (!cache)
> return -ENOSPC;
> - }
>
> btrfs_add_free_space(cache, start, len);
> btrfs_free_reserved_bytes(cache, len, delalloc);
Grrr this hunk should be dropped.... Shall I resend ?
> diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
> index fb09bc2f8e4d..ddba2dc34b5a 100644
> --- a/fs/btrfs/ordered-data.c
> +++ b/fs/btrfs/ordered-data.c
> @@ -52,14 +52,6 @@ static struct rb_node *tree_insert(struct rb_root *root, u64 file_offset,
> return NULL;
> }
>
> -static void ordered_data_tree_panic(struct inode *inode, int errno,
> - u64 offset)
> -{
> - struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
> - btrfs_panic(fs_info, errno,
> - "Inconsistency in ordered tree at offset %llu", offset);
> -}
> -
> /*
> * look for a given offset in the tree, and if it can't be found return the
> * first lesser offset
> @@ -219,7 +211,7 @@ static int __btrfs_add_ordered_extent(struct inode *inode, u64 file_offset,
> node = tree_insert(&tree->tree, file_offset,
> &entry->rb_node);
> if (node)
> - ordered_data_tree_panic(inode, -EEXIST, file_offset);
> + btrfs_panic(fs_info, -EEXIST, "Inconsistency in ordered tree at offset %llu",offset);
> spin_unlock_irq(&tree->lock);
>
> spin_lock(&root->ordered_extent_lock);
>
