5.4-stable patches

added patches:
	ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch

diff --git a/queue-5.4/ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch b/queue-5.4/ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch
new file mode 100644 (file)
index 0000000..90f9b7c
--- /dev/null
+++ b/queue-5.4/ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch
@@ -0,0 +1,45 @@
+From 3f5424790d4377839093b68c12b130077a4e4510 Mon Sep 17 00:00:00 2001
+From: zhanchengbin <zhanchengbin1@huawei.com>
+Date: Tue, 3 Jan 2023 10:28:12 +0800
+Subject: ext4: fix inode tree inconsistency caused by ENOMEM
+
+From: zhanchengbin <zhanchengbin1@huawei.com>
+
+commit 3f5424790d4377839093b68c12b130077a4e4510 upstream.
+
+If ENOMEM fails when the extent is splitting, we need to restore the length
+of the split extent.
+In the ext4_split_extent_at function, only in ext4_ext_create_new_leaf will
+it alloc memory and change the shape of the extent tree,even if an ENOMEM
+is returned at this time, the extent tree is still self-consistent, Just
+restore the split extent lens in the function ext4_split_extent_at.
+
+ext4_split_extent_at
+ ext4_ext_insert_extent
+  ext4_ext_create_new_leaf
+   1)ext4_ext_split
+     ext4_find_extent
+   2)ext4_ext_grow_indepth
+     ext4_find_extent
+
+Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
+Reviewed-by: Jan Kara <jack@suse.cz>
+Link: https://lore.kernel.org/r/20230103022812.130603-1-zhanchengbin1@huawei.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Cc: Baokun Li <libaokun1@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/extents.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/ext4/extents.c
++++ b/fs/ext4/extents.c
+@@ -3421,7 +3421,7 @@ static int ext4_split_extent_at(handle_t
+               ext4_ext_mark_unwritten(ex2);
+ 
+       err = ext4_ext_insert_extent(handle, inode, ppath, &newex, flags);
+-      if (err != -ENOSPC && err != -EDQUOT)
++      if (err != -ENOSPC && err != -EDQUOT && err != -ENOMEM)
+               goto out;
+ 
+       if (EXT4_EXT_MAY_ZEROOUT & split_flag) {

diff --git a/queue-5.4/series b/queue-5.4/series
index a1f9bdaa5bdcdb9fa3eaa44c017e885ff6a57ad0..4fb6bdeb60bf5d42c2b4837200e190d92b76c425 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -302,4 +302,5 @@ r8169-fix-spelling-mistake-tx_underun-tx_underrun.patch
 r8169-add-tally-counter-fields-added-with-rtl8125.patch
 acpi-battery-simplify-battery-hook-locking.patch
 acpi-battery-fix-possible-crash-when-unregistering-a.patch
+ext4-fix-inode-tree-inconsistency-caused-by-enomem.patch
 revert-arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-style-of-bindings.patch