From: Nikolay Borisov <nborisov@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: Re: [PATCH] btrfs: Opencode ordered_data_tree_panic
Date: Fri, 29 Nov 2019 11:49:23 +0200 [thread overview]
Message-ID: <d310c88f-547a-a5db-09a7-74d8a22957c1@suse.com> (raw)
In-Reply-To: <20191129093813.574-1-nborisov@suse.com>
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@suse.com>
> ---
> 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);
>
next prev parent reply other threads:[~2019-11-29 9:49 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-29 9:38 [PATCH] btrfs: Opencode ordered_data_tree_panic Nikolay Borisov
2019-11-29 9:49 ` Nikolay Borisov [this message]
2019-11-29 14:18 ` David Sterba
2019-12-03 19:25 ` David Sterba
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d310c88f-547a-a5db-09a7-74d8a22957c1@suse.com \
--to=nborisov@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).