drop ext4-make-directory-inode-spreading-reflect-flexbg-size.patch from everywhere

Will add it back later.

diff --git a/queue-4.14/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-4.14/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index 3835912..0000000
--- a/queue-4.14/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -513,7 +513,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-4.14/series b/queue-4.14/series
index 5623fb5b4dcdee889f0f075eb65d37fc8c2a199f..b756ae9308c608b478e136c949e418c41d95448d 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -34,5 +34,4 @@ serial-create-uart_xmit_advance.patch
 serial-tegra-use-uart_xmit_advance-fixes-icount.tx-accounting.patch
 s390-dasd-fix-oops-in-dasd_alias_get_start_dev-due-to-missing-pavgroup.patch
 drivers-hv-never-allocate-anything-besides-framebuff.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
 media-em28xx-initialize-refcount-before-kref_get.patch

diff --git a/queue-4.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-4.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index 7f3f72b..0000000
--- a/queue-4.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -505,7 +505,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-4.19/series b/queue-4.19/series
index 00f2620dbecdc857acc8e45cc373306c4da4b940..ba46d48df3c6e31799f0662f68cb25c9d1326503 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -51,5 +51,4 @@ drivers-hv-never-allocate-anything-besides-framebuff.patch
 drm-amd-display-limit-user-regamma-to-a-valid-value.patch
 drm-rockchip-fix-return-type-of-cdn_dp_connector_mod.patch
 workqueue-don-t-skip-lockdep-work-dependency-in-canc.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
 usb-dwc3-pci-allow-elkhart-lake-to-utilize-dsm-method-for-pm-functionality.patch

diff --git a/queue-4.9/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-4.9/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index 2b460c4..0000000
--- a/queue-4.9/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -511,7 +511,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-4.9/series b/queue-4.9/series
index eff6cd6723ec481a3a47b185d0b65b8997ccaaf6..addd053d7d8cbbaad30f8ad4ba409670161a9b6f 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -18,4 +18,3 @@ serial-create-uart_xmit_advance.patch
 serial-tegra-use-uart_xmit_advance-fixes-icount.tx-accounting.patch
 s390-dasd-fix-oops-in-dasd_alias_get_start_dev-due-to-missing-pavgroup.patch
 drivers-hv-never-allocate-anything-besides-framebuff.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch

diff --git a/queue-5.10/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-5.10/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index 255b86c..0000000
--- a/queue-5.10/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -508,7 +508,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-5.10/series b/queue-5.10/series
index a4e493db88e30e6b157611d917267178ab531c12..a34e2803923bd338f2700d1a59ca123459954daa 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -135,4 +135,3 @@ i2c-mlxbf-fix-frequency-calculation.patch
 devdax-fix-soft-reservation-memory-description.patch
 ext4-fix-bug-in-extents-parsing-when-eh_entries-0-and-eh_depth-0.patch
 ext4-limit-the-number-of-retries-after-discarding-preallocations-blocks.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch

diff --git a/queue-5.15/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-5.15/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index a82e75c..0000000
--- a/queue-5.15/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -510,7 +510,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-5.15/series b/queue-5.15/series
index f077bb9c18878321ab375cec9b9c263dbe9cd424..a11e39bd2046f4da04417dec1b9b0db95179b65a 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -139,5 +139,4 @@ ext4-fix-bug-in-extents-parsing-when-eh_entries-0-and-eh_depth-0.patch
 ext4-limit-the-number-of-retries-after-discarding-preallocations-blocks.patch
 ext4-make-mballoc-try-target-group-first-even-with-mb_optimize_scan.patch
 ext4-avoid-unnecessary-spreading-of-allocations-among-groups.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
 ext4-use-locality-group-preallocation-for-small-closed-files.patch

diff --git a/queue-5.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-5.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index a82e75c..0000000
--- a/queue-5.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -510,7 +510,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-5.19/series b/queue-5.19/series
index 4ce827e442b883ff835bce622014cfeecd60a372..32894bf090fe911c714b2f8e7d96074e2b8621e8 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -201,7 +201,6 @@ ext4-fix-bug-in-extents-parsing-when-eh_entries-0-and-eh_depth-0.patch
 ext4-limit-the-number-of-retries-after-discarding-preallocations-blocks.patch
 ext4-make-mballoc-try-target-group-first-even-with-mb_optimize_scan.patch
 ext4-avoid-unnecessary-spreading-of-allocations-among-groups.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
 ext4-use-locality-group-preallocation-for-small-closed-files.patch
 ext4-use-buckets-for-cr-1-block-scan-instead-of-rbtree.patch
 revert-block-freeze-the-queue-earlier-in-del_gendisk.patch

diff --git a/queue-5.4/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch b/queue-5.4/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
deleted file mode 100644 (file)
index 3c06822..0000000
--- a/queue-5.4/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 613c5a85898d1cd44e68f28d65eccf64a8ace9cf Mon Sep 17 00:00:00 2001
-From: Jan Kara <jack@suse.cz>
-Date: Thu, 8 Sep 2022 11:21:26 +0200
-Subject: ext4: make directory inode spreading reflect flexbg size
-
-From: Jan Kara <jack@suse.cz>
-
-commit 613c5a85898d1cd44e68f28d65eccf64a8ace9cf upstream.
-
-Currently the Orlov inode allocator searches for free inodes for a
-directory only in flex block groups with at most inodes_per_group/16
-more directory inodes than average per flex block group. However with
-growing size of flex block group this becomes unnecessarily strict.
-Scale allowed difference from average directory count per flex block
-group with flex block group size as we do with other metrics.
-
-Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
-Tested-by: Ojaswin Mujoo <ojaswin@linux.ibm.com>
-Cc: stable@kernel.org
-Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/
-Signed-off-by: Jan Kara <jack@suse.cz>
-Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- fs/ext4/ialloc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/fs/ext4/ialloc.c
-+++ b/fs/ext4/ialloc.c
-@@ -500,7 +500,7 @@ static int find_group_orlov(struct super
-               goto fallback;
-       }
- 
--      max_dirs = ndirs / ngroups + inodes_per_group / 16;
-+      max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16;
-       min_inodes = avefreei - inodes_per_group*flex_size / 4;
-       if (min_inodes < 1)
-               min_inodes = 1;

diff --git a/queue-5.4/series b/queue-5.4/series
index 08d34712c2e12e21adc833b84a62acc2deed7bc3..b1eb65c81691d36772496f08d525cbdfc49bc1b2 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -95,7 +95,6 @@ drm-amd-display-limit-user-regamma-to-a-valid-value.patch
 drm-rockchip-fix-return-type-of-cdn_dp_connector_mod.patch
 workqueue-don-t-skip-lockdep-work-dependency-in-canc.patch
 ext4-fix-bug-in-extents-parsing-when-eh_entries-0-and-eh_depth-0.patch
-ext4-make-directory-inode-spreading-reflect-flexbg-size.patch
 xfs-replace-eio-with-efscorrupted-for-corrupt-metadata.patch
 xfs-slightly-tweak-an-assert-in-xfs_fs_map_blocks.patch
 xfs-add-missing-assert-in-xfs_fsmap_owner_from_rmap.patch