From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v4 06/12] btrfs: extent_io: Kill the BUG_ON() in btree_write_cache_pages()
Date: Fri, 25 Jan 2019 13:09:19 +0800 [thread overview]
Message-ID: <20190125050925.30754-7-wqu@suse.com> (raw)
In-Reply-To: <20190125050925.30754-1-wqu@suse.com>
The @ret from the original function can only be 0 or <0.
<0 case is from write_one_eb() which can only return 0 or <0.
So just return @ret if something went wrong. For anything else, return
@flush_ret.
Also add a ASSERT() to catch unexpected >0 return value from
write_one_eb().
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
fs/btrfs/extent_io.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index bc3426dff5a3..5573c2355e05 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -3865,8 +3865,10 @@ int btree_write_cache_pages(struct address_space *mapping,
goto retry;
}
flush_ret = flush_write_bio(&epd);
- BUG_ON(flush_ret < 0);
- return ret;
+ ASSERT(ret <= 0);
+ if (ret)
+ return ret;
+ return flush_ret;
}
/**
--
2.20.1
next prev parent reply other threads:[~2019-01-25 5:09 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-25 5:09 [PATCH v4 00/12] btrfs: Enhancement to tree block validation Qu Wenruo
2019-01-25 5:09 ` [PATCH v4 01/12] btrfs: Always output error message when key/level verification fails Qu Wenruo
2019-01-25 9:02 ` Johannes Thumshirn
2019-01-25 5:09 ` [PATCH v4 02/12] btrfs: extent_io: Kill the forward declaration of flush_write_bio() Qu Wenruo
2019-01-25 5:09 ` [PATCH v4 03/12] btrfs: disk-io: Show the timing of corrupted tree block explicitly Qu Wenruo
2019-01-25 9:03 ` Johannes Thumshirn
2019-01-30 14:57 ` David Sterba
2019-01-30 14:59 ` Nikolay Borisov
2019-01-31 0:03 ` Qu Wenruo
2019-01-31 14:20 ` David Sterba
2019-01-31 14:22 ` Nikolay Borisov
2019-02-07 17:27 ` David Sterba
2019-01-25 5:09 ` [PATCH v4 04/12] btrfs: extent_io: Move the BUG_ON() in flush_write_bio() one level up Qu Wenruo
2019-01-25 9:04 ` Johannes Thumshirn
2019-01-30 15:08 ` David Sterba
2019-01-30 15:19 ` David Sterba
2019-01-31 0:45 ` Qu Wenruo
2019-01-31 14:36 ` David Sterba
2019-02-15 7:18 ` Qu Wenruo
2019-02-15 9:58 ` Qu Wenruo
2019-01-25 5:09 ` [PATCH v4 05/12] btrfs: extent_io: Kill the BUG_ON() in extent_write_full_page() Qu Wenruo
2019-01-25 9:05 ` Johannes Thumshirn
2019-01-25 5:09 ` Qu Wenruo [this message]
2019-01-25 9:11 ` [PATCH v4 06/12] btrfs: extent_io: Kill the BUG_ON() in btree_write_cache_pages() Johannes Thumshirn
2019-01-25 5:09 ` [PATCH v4 07/12] btrfs: extent_io: Kill the dead branch in extent_write_cache_pages() Qu Wenruo
2019-01-25 9:11 ` Johannes Thumshirn
2019-01-25 5:09 ` [PATCH v4 08/12] btrfs: extent_io: Kill the BUG_ON() in extent_write_locked_range() Qu Wenruo
2019-01-25 5:09 ` [PATCH v4 09/12] btrfs: extent_io: Kill the BUG_ON() in lock_extent_buffer_for_io() Qu Wenruo
2019-01-25 5:09 ` [PATCH v4 10/12] btrfs: extent_io: Kill the BUG_ON() in extent_write_cache_pages() Qu Wenruo
2019-01-25 9:16 ` Johannes Thumshirn
2019-01-25 5:09 ` [PATCH v4 11/12] btrfs: extent_io: Kill the BUG_ON() in extent_writepages() Qu Wenruo
2019-01-25 9:16 ` Johannes Thumshirn
2019-01-25 5:09 ` [PATCH v4 12/12] btrfs: Do mandatory tree block check before submitting bio Qu Wenruo
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=20190125050925.30754-7-wqu@suse.com \
--to=wqu@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).