* [PATCH] btrfs-progs: free-space-cache: Don't panic when free space cache is corrupted
@ 2018-07-01 2:45 Qu Wenruo
2018-07-02 7:40 ` Nikolay Borisov
2018-07-02 22:20 ` David Sterba
0 siblings, 2 replies; 3+ messages in thread
From: Qu Wenruo @ 2018-07-01 2:45 UTC (permalink / raw)
To: linux-btrfs
In btrfs_add_free_space(), if the free space to be added is already
here, we trigger ASSERT() which is just another BUG_ON().
Let's remove such BUG_ON() at all.
Reported-by: Lewis Diamond <me@lewisdiamond.com>
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
free-space-cache.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/free-space-cache.c b/free-space-cache.c
index 9b83a71ca59a..2ef2d307cc5d 100644
--- a/free-space-cache.c
+++ b/free-space-cache.c
@@ -838,10 +838,8 @@ int btrfs_add_free_space(struct btrfs_free_space_ctl *ctl, u64 offset,
try_merge_free_space(ctl, info);
ret = link_free_space(ctl, info);
- if (ret) {
+ if (ret)
printk(KERN_CRIT "btrfs: unable to add free space :%d\n", ret);
- BUG_ON(ret == -EEXIST);
- }
return ret;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs-progs: free-space-cache: Don't panic when free space cache is corrupted
2018-07-01 2:45 [PATCH] btrfs-progs: free-space-cache: Don't panic when free space cache is corrupted Qu Wenruo
@ 2018-07-02 7:40 ` Nikolay Borisov
2018-07-02 22:20 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: Nikolay Borisov @ 2018-07-02 7:40 UTC (permalink / raw)
To: Qu Wenruo, linux-btrfs
On 1.07.2018 05:45, Qu Wenruo wrote:
> In btrfs_add_free_space(), if the free space to be added is already
> here, we trigger ASSERT() which is just another BUG_ON().
>
> Let's remove such BUG_ON() at all.
>
> Reported-by: Lewis Diamond <me@lewisdiamond.com>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
> ---
> free-space-cache.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/free-space-cache.c b/free-space-cache.c
> index 9b83a71ca59a..2ef2d307cc5d 100644
> --- a/free-space-cache.c
> +++ b/free-space-cache.c
> @@ -838,10 +838,8 @@ int btrfs_add_free_space(struct btrfs_free_space_ctl *ctl, u64 offset,
> try_merge_free_space(ctl, info);
>
> ret = link_free_space(ctl, info);
> - if (ret) {
> + if (ret)
> printk(KERN_CRIT "btrfs: unable to add free space :%d\n", ret);
> - BUG_ON(ret == -EEXIST);
> - }
>
> return ret;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] btrfs-progs: free-space-cache: Don't panic when free space cache is corrupted
2018-07-01 2:45 [PATCH] btrfs-progs: free-space-cache: Don't panic when free space cache is corrupted Qu Wenruo
2018-07-02 7:40 ` Nikolay Borisov
@ 2018-07-02 22:20 ` David Sterba
1 sibling, 0 replies; 3+ messages in thread
From: David Sterba @ 2018-07-02 22:20 UTC (permalink / raw)
To: Qu Wenruo; +Cc: linux-btrfs
On Sun, Jul 01, 2018 at 10:45:26AM +0800, Qu Wenruo wrote:
> In btrfs_add_free_space(), if the free space to be added is already
> here, we trigger ASSERT() which is just another BUG_ON().
>
> Let's remove such BUG_ON() at all.
>
> Reported-by: Lewis Diamond <me@lewisdiamond.com>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-02 22:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-01 2:45 [PATCH] btrfs-progs: free-space-cache: Don't panic when free space cache is corrupted Qu Wenruo
2018-07-02 7:40 ` Nikolay Borisov
2018-07-02 22:20 ` David Sterba
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).