From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 6 Dec 2024 12:39:16 +0000 (+0100)
Subject: 5.10-stable patches
X-Git-Tag: v6.6.64~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=967e6dbb5d5eeff497fe3664d302e8eded82a162;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-stable patches

added patches:
	btrfs-don-t-bug_on-on-enomem-from-btrfs_lookup_extent_info-in-walk_down_proc.patch
---

diff --git a/queue-5.10/btrfs-don-t-bug_on-on-enomem-from-btrfs_lookup_extent_info-in-walk_down_proc.patch b/queue-5.10/btrfs-don-t-bug_on-on-enomem-from-btrfs_lookup_extent_info-in-walk_down_proc.patch
new file mode 100644
index 00000000000..bc2d98017d8
--- /dev/null
+++ b/queue-5.10/btrfs-don-t-bug_on-on-enomem-from-btrfs_lookup_extent_info-in-walk_down_proc.patch
@@ -0,0 +1,31 @@
+From a580fb2c3479d993556e1c31b237c9e5be4944a3 Mon Sep 17 00:00:00 2001
+From: Josef Bacik <josef@toxicpanda.com>
+Date: Tue, 7 May 2024 14:12:10 -0400
+Subject: btrfs: don't BUG_ON on ENOMEM from btrfs_lookup_extent_info() in walk_down_proc()
+
+From: Josef Bacik <josef@toxicpanda.com>
+
+commit a580fb2c3479d993556e1c31b237c9e5be4944a3 upstream.
+
+We handle errors here properly, ENOMEM isn't fatal, return the error.
+
+Signed-off-by: Josef Bacik <josef@toxicpanda.com>
+Reviewed-by: David Sterba <dsterba@suse.com>
+Signed-off-by: David Sterba <dsterba@suse.com>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Keerthana K <keerthana.kalyanasundaram@broadcom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/btrfs/extent-tree.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/fs/btrfs/extent-tree.c
++++ b/fs/btrfs/extent-tree.c
+@@ -4878,7 +4878,6 @@ static noinline int walk_down_proc(struc
+ 					       eb->start, level, 1,
+ 					       &wc->refs[level],
+ 					       &wc->flags[level]);
+-		BUG_ON(ret == -ENOMEM);
+ 		if (ret)
+ 			return ret;
+ 		if (unlikely(wc->refs[level] == 0)) {
diff --git a/queue-5.10/series b/queue-5.10/series
index 735e6613d1f..fbb2eb148c2 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -322,3 +322,4 @@ pci-keystone-add-link-up-check-to-ks_pcie_other_map_bus.patch
 dm-thin-add-missing-destroy_work_on_stack.patch
 nfsd-make-sure-exp-active-before-svc_export_show.patch
 nfsd-fix-nfs4_openowner-leak-when-concurrent-nfsd4_open-occur.patch
+btrfs-don-t-bug_on-on-enomem-from-btrfs_lookup_extent_info-in-walk_down_proc.patch