drop ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch

diff --git a/queue-6.1/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch b/queue-6.1/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch
deleted file mode 100644 (file)
index 537f4c9..0000000
--- a/queue-6.1/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 985b67cd86392310d9e9326de941c22fc9340eec Mon Sep 17 00:00:00 2001
-From: Lizhi Xu <lizhi.xu@windriver.com>
-Date: Wed, 5 Jun 2024 09:23:35 +0800
-Subject: ext4: filesystems without casefold feature cannot be mounted with siphash
-
-From: Lizhi Xu <lizhi.xu@windriver.com>
-
-commit 985b67cd86392310d9e9326de941c22fc9340eec upstream.
-
-When mounting the ext4 filesystem, if the default hash version is set to
-DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting.
-
-Reported-by: syzbot+340581ba9dceb7e06fb3@syzkaller.appspotmail.com
-Signed-off-by: Lizhi Xu <lizhi.xu@windriver.com>
-Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Rajani Kantha <rajanikantha@engineer.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/super.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -3546,6 +3546,13 @@ int ext4_feature_set_ok(struct super_blo
-               return 0;
-       }
- #endif
-+      if (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH &&
-+          !ext4_has_feature_casefold(sb)) {
-+              ext4_msg(sb, KERN_ERR,
-+                       "Filesystem without casefold feature cannot be "
-+                       "mounted with siphash");
-+              return 0;
-+      }
- 
-       if (readonly)
-               return 1;

diff --git a/queue-6.1/series b/queue-6.1/series
index 0a8d0b2e96d5535a528d50b90e07dc7c182b9d17..a7b0c909f9f4a937d5834ea6983b8913cbe8e3ab 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -35,7 +35,6 @@ block-fix-integer-overflow-in-blksecdiscard.patch
 revert-hid-multitouch-add-support-for-lenovo-y9000p-touchpad.patch
 vfio-platform-check-the-bounds-of-read-write-syscalls.patch
 ext4-fix-access-to-uninitialised-lock-in-fc-replay-path.patch
-ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch
 ipv4-ip_tunnel-fix-suspicious-rcu-usage-warning-in-ip_tunnel_find.patch
 scsi-storvsc-ratelimit-warning-logs-to-prevent-vm-denial-of-service.patch
 wifi-iwlwifi-add-a-few-rate-index-validity-checks.patch

diff --git a/queue-6.6/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch b/queue-6.6/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch
deleted file mode 100644 (file)
index fac1067..0000000
--- a/queue-6.6/ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 985b67cd86392310d9e9326de941c22fc9340eec Mon Sep 17 00:00:00 2001
-From: Lizhi Xu <lizhi.xu@windriver.com>
-Date: Wed, 5 Jun 2024 09:23:35 +0800
-Subject: ext4: filesystems without casefold feature cannot be mounted with siphash
-
-From: Lizhi Xu <lizhi.xu@windriver.com>
-
-commit 985b67cd86392310d9e9326de941c22fc9340eec upstream.
-
-When mounting the ext4 filesystem, if the default hash version is set to
-DX_HASH_SIPHASH but the casefold feature is not set, exit the mounting.
-
-Reported-by: syzbot+340581ba9dceb7e06fb3@syzkaller.appspotmail.com
-Signed-off-by: Lizhi Xu <lizhi.xu@windriver.com>
-Link: https://patch.msgid.link/20240605012335.44086-1-lizhi.xu@windriver.com
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Rajani Kantha <rajanikantha@engineer.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/super.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/fs/ext4/super.c
-+++ b/fs/ext4/super.c
-@@ -3626,6 +3626,13 @@ int ext4_feature_set_ok(struct super_blo
-               return 0;
-       }
- #endif
-+      if (EXT4_SB(sb)->s_es->s_def_hash_version == DX_HASH_SIPHASH &&
-+          !ext4_has_feature_casefold(sb)) {
-+              ext4_msg(sb, KERN_ERR,
-+                       "Filesystem without casefold feature cannot be "
-+                       "mounted with siphash");
-+              return 0;
-+      }
- 
-       if (readonly)
-               return 1;

diff --git a/queue-6.6/series b/queue-6.6/series
index 1679bd72add971d7fe7d7ef4f7b8ac3330fd2845..912f131349d7182b78dcdfeaf9d32e5d1110fe99 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -29,7 +29,6 @@ revert-hid-multitouch-add-support-for-lenovo-y9000p-touchpad.patch
 cachestat-fix-page-cache-statistics-permission-checking.patch
 vfio-platform-check-the-bounds-of-read-write-syscalls.patch
 ext4-fix-access-to-uninitialised-lock-in-fc-replay-path.patch
-ext4-filesystems-without-casefold-feature-cannot-be-mounted-with-siphash.patch
 ipv4-ip_tunnel-fix-suspicious-rcu-usage-warning-in-ip_tunnel_find.patch
 scsi-storvsc-ratelimit-warning-logs-to-prevent-vm-denial-of-service.patch
 usb-serial-quatech2-fix-null-ptr-deref-in-qt2_process_read_urb.patch