[PATCH v5.10-v6.6] btrfs: don't BUG_ON on ENOMEM from btrfs_lookuip_extent_info() in walk_down_proc()
From: Josef Bacik josef@toxicpanda.com
[ Upstream commit a580fb2c3479d993556e1c31b237c9e5be4944a3 ]
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 --- fs/btrfs/extent-tree.c | 1 - 1 file changed, 1 deletion(-)
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 0d97c8ee6..f53c4d52b 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c @@ -5213,7 +5213,6 @@ static noinline int walk_down_proc(struct btrfs_trans_handle *trans, eb->start, level, 1, &wc->refs[level], &wc->flags[level]); - BUG_ON(ret == -ENOMEM); if (ret) return ret; if (unlikely(wc->refs[level] == 0)) {
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: a580fb2c3479d993556e1c31b237c9e5be4944a3
WARNING: Author mismatch between patch and upstream commit: Backport author: Keerthana K keerthana.kalyanasundaram@broadcom.com Commit author: Josef Bacik josef@toxicpanda.com
Status in newer kernel trees: 6.12.y | Present (exact SHA1) 6.6.y | Not found
Note: The patch differs from the upstream commit: --- 1: a580fb2c3479d < -: ------------- btrfs: don't BUG_ON on ENOMEM from btrfs_lookup_extent_info() in walk_down_proc() -: ------------- > 1: 614d01a4521eb btrfs: don't BUG_ON on ENOMEM from btrfs_lookuip_extent_info() in walk_down_proc() ---
Results of testing on various branches:
| Branch | Patch Apply | Build Test | |---------------------------|-------------|------------| | stable/linux-6.6.y | Success | Success | | stable/linux-5.10.y | Success | Success |
linux-stable-mirror@lists.linaro.org
-
Keerthana K -
Sasha Levin