From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 16:57:51 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v6.0.3~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c57ef7cc9819d5b3f5bc8f7bcaebb06641d3b3ac;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch --- diff --git a/queue-5.4/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch b/queue-5.4/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch new file mode 100644 index 00000000000..6fab9fbbf9d --- /dev/null +++ b/queue-5.4/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?= + +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 李修賢 + +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 +Link: https://lore.kernel.org/r/PU1PR04MB22635E739BD21150DC182AC6A18C9@PU1PR04MB2263.apcprd04.prod.outlook.com +Signed-off-by: Theodore Ts'o +Signed-off-by: Greg Kroah-Hartman +--- + fs/ext4/resize.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/ext4/resize.c ++++ b/fs/ext4/resize.c +@@ -2090,7 +2090,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.4/series b/queue-5.4/series index 0dd397c3f23..5c80d267394 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -265,3 +265,4 @@ io_uring-af_unix-defer-registered-files-gc-to-io_uring-release.patch net-ieee802154-return-einval-for-unknown-addr-type.patch revert-net-ieee802154-reject-zero-sized-raw_sendmsg.patch net-ieee802154-don-t-warn-zero-sized-raw_sendmsg.patch +ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch