From: Sasha Levin Date: Fri, 23 May 2025 12:22:09 +0000 (-0400) Subject: Drop f2fs-defer-readonly-check-vs-norecovery.patch X-Git-Tag: v6.12.31~81 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d404a16a1c014fa3107300eb4fad13acf13c1fd;p=thirdparty%2Fkernel%2Fstable-queue.git Drop f2fs-defer-readonly-check-vs-norecovery.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/f2fs-defer-readonly-check-vs-norecovery.patch b/queue-5.15/f2fs-defer-readonly-check-vs-norecovery.patch deleted file mode 100644 index 877b391e13..0000000000 --- a/queue-5.15/f2fs-defer-readonly-check-vs-norecovery.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 7afa5336b9d9b72466e00848fbbfc8ede4a66e58 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Mar 2025 11:12:17 -0600 -Subject: f2fs: defer readonly check vs norecovery - -From: Eric Sandeen - -[ Upstream commit 9cca49875997a1a7e92800a828a62bacb0f577b9 ] - -Defer the readonly-vs-norecovery check until after option parsing is done -so that option parsing does not require an active superblock for the test. -Add a helpful message, while we're at it. - -(I think could be moved back into parsing after we switch to the new mount -API if desired, as the fs context will have RO state available.) - -Signed-off-by: Eric Sandeen -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 0cf564ded140a..77a7b789e32ad 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -729,10 +729,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - set_opt(sbi, DISABLE_ROLL_FORWARD); - break; - case Opt_norecovery: -- /* this option mounts f2fs with ro */ -+ /* requires ro mount, checked in f2fs_default_check */ - set_opt(sbi, NORECOVERY); -- if (!f2fs_readonly(sb)) -- return -EINVAL; - break; - case Opt_discard: - if (!f2fs_hw_support_discard(sbi)) { -@@ -1386,6 +1384,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - f2fs_err(sbi, "Allow to mount readonly mode only"); - return -EROFS; - } -+ -+ if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) { -+ f2fs_err(sbi, "norecovery requires readonly mount"); -+ return -EINVAL; -+ } -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-5.15/series b/queue-5.15/series index 45d17e925d..afdec3a672 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -47,7 +47,6 @@ kbuild-fix-argument-parsing-in-scripts-config.patch crypto-octeontx2-suppress-auth-failure-screaming-due.patch dm-restrict-dm-device-size-to-2-63-512-bytes.patch xen-add-support-for-xenserver-6.1-platform-device.patch -f2fs-defer-readonly-check-vs-norecovery.patch rdma-uverbs-propagate-errors-from-rdma_lookup_get_uo.patch posix-timers-add-cond_resched-to-posix_timer_add-sea.patch timer_list-don-t-use-pk-through-printk.patch diff --git a/queue-6.1/f2fs-defer-readonly-check-vs-norecovery.patch b/queue-6.1/f2fs-defer-readonly-check-vs-norecovery.patch deleted file mode 100644 index 9b3fbb45b2..0000000000 --- a/queue-6.1/f2fs-defer-readonly-check-vs-norecovery.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c1ca5354510c644ade0b2bc9a192ffd5a622ec80 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Mar 2025 11:12:17 -0600 -Subject: f2fs: defer readonly check vs norecovery - -From: Eric Sandeen - -[ Upstream commit 9cca49875997a1a7e92800a828a62bacb0f577b9 ] - -Defer the readonly-vs-norecovery check until after option parsing is done -so that option parsing does not require an active superblock for the test. -Add a helpful message, while we're at it. - -(I think could be moved back into parsing after we switch to the new mount -API if desired, as the fs context will have RO state available.) - -Signed-off-by: Eric Sandeen -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 72160b906f4b3..0802357d45256 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -745,10 +745,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - set_opt(sbi, DISABLE_ROLL_FORWARD); - break; - case Opt_norecovery: -- /* this option mounts f2fs with ro */ -+ /* requires ro mount, checked in f2fs_default_check */ - set_opt(sbi, NORECOVERY); -- if (!f2fs_readonly(sb)) -- return -EINVAL; - break; - case Opt_discard: - if (!f2fs_hw_support_discard(sbi)) { -@@ -1404,6 +1402,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - f2fs_err(sbi, "Allow to mount readonly mode only"); - return -EROFS; - } -+ -+ if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) { -+ f2fs_err(sbi, "norecovery requires readonly mount"); -+ return -EINVAL; -+ } -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-6.1/series b/queue-6.1/series index 985e06d26d..97b73f100a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -76,7 +76,6 @@ net-smc-use-the-correct-ndev-to-find-pnetid-by-pneti.patch xen-add-support-for-xenserver-6.1-platform-device.patch pinctrl-tegra-restore-sfsel-bit-when-freeing-pins.patch asoc-sun4i-codec-support-hp-det-gpios-property.patch -f2fs-defer-readonly-check-vs-norecovery.patch ext4-reject-the-data_err-abort-option-in-nojournal-m.patch rdma-uverbs-propagate-errors-from-rdma_lookup_get_uo.patch posix-timers-add-cond_resched-to-posix_timer_add-sea.patch diff --git a/queue-6.12/f2fs-defer-readonly-check-vs-norecovery.patch b/queue-6.12/f2fs-defer-readonly-check-vs-norecovery.patch deleted file mode 100644 index c4de5874ae..0000000000 --- a/queue-6.12/f2fs-defer-readonly-check-vs-norecovery.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0aee74b380502a70551552e1a423ea85d1b2bdfb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Mar 2025 11:12:17 -0600 -Subject: f2fs: defer readonly check vs norecovery - -From: Eric Sandeen - -[ Upstream commit 9cca49875997a1a7e92800a828a62bacb0f577b9 ] - -Defer the readonly-vs-norecovery check until after option parsing is done -so that option parsing does not require an active superblock for the test. -Add a helpful message, while we're at it. - -(I think could be moved back into parsing after we switch to the new mount -API if desired, as the fs context will have RO state available.) - -Signed-off-by: Eric Sandeen -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 573cc4725e2e8..280debf2df4f6 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -728,10 +728,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - set_opt(sbi, DISABLE_ROLL_FORWARD); - break; - case Opt_norecovery: -- /* this option mounts f2fs with ro */ -+ /* requires ro mount, checked in f2fs_default_check */ - set_opt(sbi, NORECOVERY); -- if (!f2fs_readonly(sb)) -- return -EINVAL; - break; - case Opt_discard: - if (!f2fs_hw_support_discard(sbi)) { -@@ -1406,6 +1404,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - f2fs_err(sbi, "Allow to mount readonly mode only"); - return -EROFS; - } -+ -+ if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) { -+ f2fs_err(sbi, "norecovery requires readonly mount"); -+ return -EINVAL; -+ } -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-6.12/series b/queue-6.12/series index 23713080c1..1fd9980cdb 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -164,7 +164,6 @@ drm-amdgpu-gfx11-don-t-read-registers-in-mqd-init.patch drm-amdgpu-update-sriov-video-codec-caps.patch asoc-sun4i-codec-support-hp-det-gpios-property.patch clk-qcom-lpassaudiocc-sc7280-add-support-for-lpass-r.patch -f2fs-defer-readonly-check-vs-norecovery.patch ext4-reject-the-data_err-abort-option-in-nojournal-m.patch ext4-do-not-convert-the-unwritten-extents-if-data-wr.patch rdma-uverbs-propagate-errors-from-rdma_lookup_get_uo.patch diff --git a/queue-6.14/f2fs-defer-readonly-check-vs-norecovery.patch b/queue-6.14/f2fs-defer-readonly-check-vs-norecovery.patch deleted file mode 100644 index b4d6907ad1..0000000000 --- a/queue-6.14/f2fs-defer-readonly-check-vs-norecovery.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 442e4090bb78d5dce4506a591214ce2447d6ea50 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Mar 2025 11:12:17 -0600 -Subject: f2fs: defer readonly check vs norecovery - -From: Eric Sandeen - -[ Upstream commit 9cca49875997a1a7e92800a828a62bacb0f577b9 ] - -Defer the readonly-vs-norecovery check until after option parsing is done -so that option parsing does not require an active superblock for the test. -Add a helpful message, while we're at it. - -(I think could be moved back into parsing after we switch to the new mount -API if desired, as the fs context will have RO state available.) - -Signed-off-by: Eric Sandeen -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index b8a0e925a4011..d3b04a589b525 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -728,10 +728,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - set_opt(sbi, DISABLE_ROLL_FORWARD); - break; - case Opt_norecovery: -- /* this option mounts f2fs with ro */ -+ /* requires ro mount, checked in f2fs_default_check */ - set_opt(sbi, NORECOVERY); -- if (!f2fs_readonly(sb)) -- return -EINVAL; - break; - case Opt_discard: - if (!f2fs_hw_support_discard(sbi)) { -@@ -1418,6 +1416,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - f2fs_err(sbi, "Allow to mount readonly mode only"); - return -EROFS; - } -+ -+ if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) { -+ f2fs_err(sbi, "norecovery requires readonly mount"); -+ return -EINVAL; -+ } -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-6.14/series b/queue-6.14/series index cd0f61a487..3eabb88b83 100644 --- a/queue-6.14/series +++ b/queue-6.14/series @@ -193,7 +193,6 @@ drm-amdgpu-update-sriov-video-codec-caps.patch asoc-sun4i-codec-support-hp-det-gpios-property.patch asoc-sun4i-codec-correct-dapm-widgets-and-controls-f.patch clk-qcom-lpassaudiocc-sc7280-add-support-for-lpass-r.patch -f2fs-defer-readonly-check-vs-norecovery.patch leds-kconfig-leds-st1202-add-select-for-required-led.patch leds-leds-st1202-initialize-hardware-before-dt-node-.patch ext4-reject-the-data_err-abort-option-in-nojournal-m.patch diff --git a/queue-6.6/f2fs-defer-readonly-check-vs-norecovery.patch b/queue-6.6/f2fs-defer-readonly-check-vs-norecovery.patch deleted file mode 100644 index c0b8cd64f4..0000000000 --- a/queue-6.6/f2fs-defer-readonly-check-vs-norecovery.patch +++ /dev/null @@ -1,56 +0,0 @@ -From e2bb2972e0846d3d0093cc3cf91c12ae24aadc7d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Mar 2025 11:12:17 -0600 -Subject: f2fs: defer readonly check vs norecovery - -From: Eric Sandeen - -[ Upstream commit 9cca49875997a1a7e92800a828a62bacb0f577b9 ] - -Defer the readonly-vs-norecovery check until after option parsing is done -so that option parsing does not require an active superblock for the test. -Add a helpful message, while we're at it. - -(I think could be moved back into parsing after we switch to the new mount -API if desired, as the fs context will have RO state available.) - -Signed-off-by: Eric Sandeen -Reviewed-by: Chao Yu -Signed-off-by: Jaegeuk Kim -Signed-off-by: Sasha Levin ---- - fs/f2fs/super.c | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c -index 4cc87921aac3e..10e50bede8080 100644 ---- a/fs/f2fs/super.c -+++ b/fs/f2fs/super.c -@@ -707,10 +707,8 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - set_opt(sbi, DISABLE_ROLL_FORWARD); - break; - case Opt_norecovery: -- /* this option mounts f2fs with ro */ -+ /* requires ro mount, checked in f2fs_default_check */ - set_opt(sbi, NORECOVERY); -- if (!f2fs_readonly(sb)) -- return -EINVAL; - break; - case Opt_discard: - if (!f2fs_hw_support_discard(sbi)) { -@@ -1390,6 +1388,12 @@ static int parse_options(struct super_block *sb, char *options, bool is_remount) - f2fs_err(sbi, "Allow to mount readonly mode only"); - return -EROFS; - } -+ -+ if (test_opt(sbi, NORECOVERY) && !f2fs_readonly(sbi->sb)) { -+ f2fs_err(sbi, "norecovery requires readonly mount"); -+ return -EINVAL; -+ } -+ - return 0; - } - --- -2.39.5 - diff --git a/queue-6.6/series b/queue-6.6/series index 4e82d1eaf7..73e67eeb58 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -106,7 +106,6 @@ pinctrl-tegra-restore-sfsel-bit-when-freeing-pins.patch mfd-tps65219-remove-tps65219_reg_ti_dev_id-check.patch drm-amdgpu-update-sriov-video-codec-caps.patch asoc-sun4i-codec-support-hp-det-gpios-property.patch -f2fs-defer-readonly-check-vs-norecovery.patch ext4-reject-the-data_err-abort-option-in-nojournal-m.patch ext4-do-not-convert-the-unwritten-extents-if-data-wr.patch rdma-uverbs-propagate-errors-from-rdma_lookup_get_uo.patch