All of lore.kernel.org
 help / color / mirror / Atom feed
From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v5.3 07/11] btrfs: extent_io: Handle error better in extent_write_locked_range()
Date: Wed, 20 Mar 2019 14:27:45 +0800	[thread overview]
Message-ID: <20190320062749.30953-8-wqu@suse.com> (raw)
In-Reply-To: <20190320062749.30953-1-wqu@suse.com>

Do proper cleanup if we hit any error in extent_write_locked_range(),
and check the return value of flush_write_bio().

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 fs/btrfs/extent_io.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
index 4ad7c6afe623..c688049ccfc3 100644
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
@@ -4077,7 +4077,6 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
 			      int mode)
 {
 	int ret = 0;
-	int flush_ret;
 	struct address_space *mapping = inode->i_mapping;
 	struct extent_io_tree *tree = &BTRFS_I(inode)->io_tree;
 	struct page *page;
@@ -4110,8 +4109,12 @@ int extent_write_locked_range(struct inode *inode, u64 start, u64 end,
 		start += PAGE_SIZE;
 	}
 
-	flush_ret = flush_write_bio(&epd);
-	BUG_ON(flush_ret < 0);
+	ASSERT(ret <= 0);
+	if (ret < 0) {
+		end_write_bio(&epd, ret);
+		return ret;
+	}
+	ret = flush_write_bio(&epd);
 	return ret;
 }
 
-- 
2.21.0


  parent reply	other threads:[~2019-03-20  6:28 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-20  6:27 [PATCH v5.3 00/11] btrfs: tree-checker: Write time tree checker Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 01/11] btrfs: Always output error message when key/level verification fails Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 02/11] btrfs: disk-io: Show the timing of corrupted tree block explicitly Qu Wenruo
2019-03-29 14:11   ` David Sterba
2019-03-29 14:18     ` Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 03/11] btrfs: extent_io: Move the BUG_ON() in flush_write_bio() one level up Qu Wenruo
2019-03-20 19:39   ` David Sterba
2019-03-20  6:27 ` [PATCH v5.3 04/11] btrfs: extent_io: Handle error better in extent_write_full_page() Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 05/11] btrfs: extent_io: Handle error better in btree_write_cache_pages() Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 06/11] btrfs: extent_io: Kill the dead branch in extent_write_cache_pages() Qu Wenruo
2019-03-20  6:27 ` Qu Wenruo [this message]
2019-03-21 13:19   ` [PATCH v5.3 07/11] btrfs: extent_io: Handle error better in extent_write_locked_range() David Sterba
2019-03-21 13:45     ` Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 08/11] btrfs: extent_io: Kill the BUG_ON() in lock_extent_buffer_for_io() Qu Wenruo
2019-03-21 13:30   ` David Sterba
2019-03-20  6:27 ` [PATCH v5.3 09/11] btrfs: extent_io: Kill the BUG_ON() in extent_write_cache_pages() Qu Wenruo
2019-03-21 14:14   ` David Sterba
2019-03-20  6:27 ` [PATCH v5.3 10/11] btrfs: extent_io: Handle error better in extent_writepages() Qu Wenruo
2019-03-20  6:27 ` [PATCH v5.3 11/11] btrfs: Do mandatory tree block check before submitting bio Qu Wenruo
2019-04-03  9:07   ` Qu Wenruo
2019-03-21 14:34 ` [PATCH v5.3 00/11] btrfs: tree-checker: Write time tree checker David Sterba
2019-03-21 23:56   ` Qu Wenruo
2019-03-22 17:52     ` David Sterba
2019-03-25  4:32       ` 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=20190320062749.30953-8-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.