6.0-stable patches

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

diff --git a/queue-6.0/ext4-continue-to-expand-file-system-when-the-target-.patch b/queue-6.0/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch
similarity index 81%
rename from queue-6.0/ext4-continue-to-expand-file-system-when-the-target-.patch
rename to queue-6.0/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch
index 6375acc3216a5078903415f50253b15aeff169c0..fec7c5146d7ffc9b8e454e6db3814fa6b4c03349 100644 (file)
--- a/queue-6.0/ext4-continue-to-expand-file-system-when-the-target-.patch
+++ b/queue-6.0/ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch
@@ -1,15 +1,15 @@
-From d92c21f858fefb7cb5b94b96a40cabd48d984fc8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
+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
+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>
 
-[ Upstream commit df3cb754d13d2cd5490db9b8d536311f8413a92e ]
+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
@@ -42,17 +42,14 @@ The filesystem on /dev/mapper/thin is now 4831837696 (4k) blocks long.
 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>
-Stable-dep-of: 426d15ad1141 ("ext4: don't run ext4lazyinit for read-only filesystems")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- fs/ext4/resize.c | 2 +-
+ fs/ext4/resize.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
-index fea2a68d067b..6dfe9ccae0c5 100644
 --- a/fs/ext4/resize.c
 +++ b/fs/ext4/resize.c
-@@ -2122,7 +2122,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count)
+@@ -2122,7 +2122,7 @@ retry:
                        goto out;
        }
  
@@ -61,6 +58,3 @@ index fea2a68d067b..6dfe9ccae0c5 100644
                goto out;
  
        err = ext4_alloc_flex_bg_array(sb, n_group + 1);
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index 468cd41d7eeb8ad77235590160b02513acc4cbdc..c36656392d919b5320a29da31223c8d73091b33e 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -447,7 +447,7 @@ arm64-dts-qcom-sm8450-fix-ufs-phy-serdes-size.patch
 arm64-dts-ti-k3-j7200-fix-main-pinmux-range.patch
 arm-dts-exynos-correct-s5k6a3-reset-polarity-on-mida.patch
 arm-drop-cmdline_-dependency-on-atags.patch
-ext4-continue-to-expand-file-system-when-the-target-.patch
+ext4-continue-to-expand-file-system-when-the-target-size-doesn-t-reach.patch
 ext4-don-t-run-ext4lazyinit-for-read-only-filesystem.patch
 arm64-ftrace-fix-module-plts-with-mcount.patch
 arm64-dts-exynos-fix-polarity-of-enable-line-of-nfc-.patch