From: Greg Kroah-Hartman Date: Tue, 27 Sep 2022 11:55:30 +0000 (+0200) Subject: 4.14-stable patches X-Git-Tag: v4.9.330~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=328994213c34d3f5919047a7ee641b9153d74c10;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: 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 new file mode 100644 index 00000000000..3835912538c --- /dev/null +++ b/queue-4.14/ext4-make-directory-inode-spreading-reflect-flexbg-size.patch @@ -0,0 +1,39 @@ +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 b756ae9308c..698271756d5 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -35,3 +35,4 @@ 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 media-em28xx-initialize-refcount-before-kref_get.patch +ext4-make-directory-inode-spreading-reflect-flexbg-size.patch