5.10-stable patches

added patches:
	ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch

diff --git a/queue-5.10/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch b/queue-5.10/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch
new file mode 100644 (file)
index 0000000..0a75cfa
--- /dev/null
+++ b/queue-5.10/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch
@@ -0,0 +1,60 @@
+From df3cb754d13d2cd5490db9b8d536311f8413a92e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jerry=20Lee=20=E6=9D=8E=E4=BF=AE=E8=B3=A2?=
+ <jerrylee@qnap.com>
+Date: Mon, 18 Jul 2022 10:25:19 +0000
+Subject: ext4: continue to expand file system when the target size doesn't reach
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Jerry Lee 李修賢 <jerrylee@qnap.com>
+
+commit df3cb754d13d2cd5490db9b8d536311f8413a92e upstream.
+
+When expanding a file system from (16TiB-2MiB) to 18TiB, the operation
+exits early which leads to result inconsistency between resize2fs and
+Ext4 kernel driver.
+
+=== before ===
+○ → resize2fs /dev/mapper/thin
+resize2fs 1.45.5 (07-Jan-2020)
+Filesystem at /dev/mapper/thin is mounted on /mnt/test; on-line resizing required
+old_desc_blocks = 2048, new_desc_blocks = 2304
+The filesystem on /dev/mapper/thin is now 4831837696 (4k) blocks long.
+
+[  865.186308] EXT4-fs (dm-5): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none.
+[  912.091502] dm-4: detected capacity change from 34359738368 to 38654705664
+[  970.030550] dm-5: detected capacity change from 34359734272 to 38654701568
+[ 1000.012751] EXT4-fs (dm-5): resizing filesystem from 4294966784 to 4831837696 blocks
+[ 1000.012878] EXT4-fs (dm-5): resized filesystem to 4294967296
+
+=== after ===
+[  129.104898] EXT4-fs (dm-5): mounted filesystem with ordered data mode. Opts: (null). Quota mode: none.
+[  143.773630] dm-4: detected capacity change from 34359738368 to 38654705664
+[  198.203246] dm-5: detected capacity change from 34359734272 to 38654701568
+[  207.918603] EXT4-fs (dm-5): resizing filesystem from 4294966784 to 4831837696 blocks
+[  207.918754] EXT4-fs (dm-5): resizing filesystem from 4294967296 to 4831837696 blocks
+[  207.918758] EXT4-fs (dm-5): Converting file system to meta_bg
+[  207.918790] EXT4-fs (dm-5): resizing filesystem from 4294967296 to 4831837696 blocks
+[  221.454050] EXT4-fs (dm-5): resized to 4658298880 blocks
+[  227.634613] EXT4-fs (dm-5): resized filesystem to 4831837696
+
+Signed-off-by: Jerry Lee <jerrylee@qnap.com>
+Link: https://lore.kernel.org/r/PU1PR04MB22635E739BD21150DC182AC6A18C9@PU1PR04MB2263.apcprd04.prod.outlook.com
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ fs/ext4/resize.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/ext4/resize.c
++++ b/fs/ext4/resize.c
+@@ -2068,7 +2068,7 @@ retry:
+                       goto out;
+       }
+ 
+-      if (ext4_blocks_count(es) == n_blocks_count)
++      if (ext4_blocks_count(es) == n_blocks_count && n_blocks_count_retry == 0)
+               goto out;
+ 
+       err = ext4_alloc_flex_bg_array(sb, n_group + 1);

diff --git a/queue-5.10/series b/queue-5.10/series
index 584e557023b813a1abcb72eccc36aed23ff12791..73fb00fedd70a7e33f11a0d84777259d9838c9c6 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -450,3 +450,4 @@ clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch
 net-wwan-t7xx-use-gfp_atomic-under-spin-lock-in-t7xx_cldma_gpd_set_next_ptr.patch
 revert-drm-amdgpu-move-nbio-sdma_doorbell_range-into-sdma-code-for-vega.patch
 revert-drm-amdgpu-use-dirty-framebuffer-helper.patch
+ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch