Fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/btrfs-fix-missing-error-return-if-writeback-for-exte.patch b/queue-4.14/btrfs-fix-missing-error-return-if-writeback-for-exte.patch
new file mode 100644 (file)
index 0000000..bcab909
--- /dev/null
+++ b/queue-4.14/btrfs-fix-missing-error-return-if-writeback-for-exte.patch
@@ -0,0 +1,47 @@
+From 0c2d6fba54904cc9d40325a834f1b5789fc26227 Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Wed, 11 Sep 2019 17:42:28 +0100
+Subject: Btrfs: fix missing error return if writeback for extent buffer never
+ started
+
+From: Filipe Manana <fdmanana@suse.com>
+
+[ Upstream commit 0607eb1d452d45c5ac4c745a9e9e0d95152ea9d0 ]
+
+If lock_extent_buffer_for_io() fails, it returns a negative value, but its
+caller btree_write_cache_pages() ignores such error. This means that a
+call to flush_write_bio(), from lock_extent_buffer_for_io(), might have
+failed. We should make btree_write_cache_pages() notice such error values
+and stop immediatelly, making sure filemap_fdatawrite_range() returns an
+error to the transaction commit path. A failure from flush_write_bio()
+should also result in the endio callback end_bio_extent_buffer_writepage()
+being invoked, which sets the BTRFS_FS_*_ERR bits appropriately, so that
+there's no risk a transaction or log commit doesn't catch a writeback
+failure.
+
+Reviewed-by: Josef Bacik <josef@toxicpanda.com>
+Signed-off-by: Filipe Manana <fdmanana@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ fs/btrfs/extent_io.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/fs/btrfs/extent_io.c b/fs/btrfs/extent_io.c
+index 0ba338cffa937..fd56c22c12a0e 100644
+--- a/fs/btrfs/extent_io.c
++++ b/fs/btrfs/extent_io.c
+@@ -3869,6 +3869,10 @@ int btree_write_cache_pages(struct address_space *mapping,
+                       if (!ret) {
+                               free_extent_buffer(eb);
+                               continue;
++                      } else if (ret < 0) {
++                              done = 1;
++                              free_extent_buffer(eb);
++                              break;
+                       }
+ 
+                       ret = write_one_eb(eb, fs_info, wbc, &epd);
+-- 
+2.27.0
+

diff --git a/queue-4.14/series b/queue-4.14/series
index 00aab3c21b07e77ac63e7c37c1ef5e53f668db48..dd95b961e1d25eb8302e99a4741fc99239c47ba5 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -18,3 +18,4 @@ can-peak_usb-add-range-checking-in-decode-operations.patch
 can-peak_usb-peak_usb_get_ts_time-fix-timestamp-wrap.patch
 can-peak_canfd-pucan_handle_can_rx-fix-echo-manageme.patch
 xfs-flush-new-eof-page-on-truncate-to-avoid-post-eof.patch
+btrfs-fix-missing-error-return-if-writeback-for-exte.patch