From 44cc913e19a1373959b3a26a74976c9da32d59ad Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 26 Sep 2022 19:45:20 +0200 Subject: [PATCH] drop ext4-make-directory-inode-spreading-reflect-flexbg-size.patch from everywhere Will add it back later. --- ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-4.14/series | 1 - ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-4.19/series | 1 - ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-4.9/series | 1 - ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-5.10/series | 1 - ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-5.15/series | 1 - ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-5.19/series | 1 - ...-inode-spreading-reflect-flexbg-size.patch | 39 ------------------- queue-5.4/series | 1 - 14 files changed, 280 deletions(-) delete mode 100644 queue-4.14/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch delete mode 100644 queue-4.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch delete mode 100644 queue-4.9/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch delete mode 100644 queue-5.10/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch delete mode 100644 queue-5.15/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch delete mode 100644 queue-5.19/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch delete mode 100644 queue-5.4/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch 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 index 3835912538c..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 5623fb5b4dc..b756ae9308c 100644 --- 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 index 7f3f72b940b..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 00f2620dbec..ba46d48df3c 100644 --- 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 index 2b460c491a7..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 eff6cd6723e..addd053d7d8 100644 --- 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 index 255b86c4524..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 a4e493db88e..a34e2803923 100644 --- 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 index a82e75c65b2..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 f077bb9c188..a11e39bd204 100644 --- 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 index a82e75c65b2..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 4ce827e442b..32894bf090f 100644 --- 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 index 3c0682268f9..00000000000 --- 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 -Date: Thu, 8 Sep 2022 11:21:26 +0200 -Subject: ext4: make directory inode spreading reflect flexbg size - -From: Jan Kara - -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 -Tested-by: Ojaswin Mujoo -Cc: stable@kernel.org -Link: https://lore.kernel.org/all/0d81a7c2-46b7-6010-62a4-3e6cfc1628d6@i2se.com/ -Signed-off-by: Jan Kara -Link: https://lore.kernel.org/r/20220908092136.11770-3-jack@suse.cz -Signed-off-by: Theodore Ts'o -Signed-off-by: Greg Kroah-Hartman ---- - 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 08d34712c2e..b1eb65c8169 100644 --- 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 -- 2.47.3