4.4-stable patches

added patches:
	btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch

diff --git a/queue-4.4/btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch b/queue-4.4/btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
new file mode 100644 (file)
index 0000000..b9ae084
--- /dev/null
+++ b/queue-4.4/btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch
@@ -0,0 +1,37 @@
+From 10adb1152d957a4d570ad630f93a88bb961616c1 Mon Sep 17 00:00:00 2001
+From: Filipe Manana <fdmanana@suse.com>
+Date: Thu, 14 Oct 2021 17:26:04 +0100
+Subject: btrfs: fix lost error handling when replaying directory deletes
+
+From: Filipe Manana <fdmanana@suse.com>
+
+commit 10adb1152d957a4d570ad630f93a88bb961616c1 upstream.
+
+At replay_dir_deletes(), if find_dir_range() returns an error we break out
+of the main while loop and then assign a value of 0 (success) to the 'ret'
+variable, resulting in completely ignoring that an error happened. Fix
+that by jumping to the 'out' label when find_dir_range() returns an error
+(negative value).
+
+CC: stable@vger.kernel.org # 4.4+
+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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/tree-log.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/fs/btrfs/tree-log.c
++++ b/fs/btrfs/tree-log.c
+@@ -2207,7 +2207,9 @@ again:
+               else {
+                       ret = find_dir_range(log, path, dirid, key_type,
+                                            &range_start, &range_end);
+-                      if (ret != 0)
++                      if (ret < 0)
++                              goto out;
++                      else if (ret > 0)
+                               break;
+               }
+ 

diff --git a/queue-4.4/series b/queue-4.4/series
index b79992099834da6d4d25edaf3ceb1c7cbc0057f6..c8a2ed34ec0f42265dd49132ce38042292bf262a 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -20,3 +20,4 @@ mmc-winbond-don-t-build-on-m68k.patch
 xen-netfront-stop-tx-queues-during-live-migration.patch
 spi-spl022-fix-microwire-full-duplex-mode.patch
 vmxnet3-do-not-stop-tx-queues-after-netif_device_det.patch
+btrfs-fix-lost-error-handling-when-replaying-directory-deletes.patch