5.4.90, 5.10.8
This commit is contained in:
parent
bc861366c1
commit
ec15d047dd
8
PKGBUILD
8
PKGBUILD
@ -48,7 +48,7 @@ else
|
||||
fi
|
||||
pkgname=("${pkgbase}" "${pkgbase}-headers")
|
||||
pkgver="${_basekernel}"."${_sub}"
|
||||
pkgrel=111
|
||||
pkgrel=112
|
||||
pkgdesc='Linux-tkg'
|
||||
arch=('x86_64') # no i686 in here
|
||||
url="http://www.kernel.org/"
|
||||
@ -91,7 +91,7 @@ case $_basever in
|
||||
0012-linux-hardened.patch
|
||||
)
|
||||
sha256sums=('bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491'
|
||||
'e54d3d471824488dea2210303330b05d73f789021c90ccd2d3bc11069c7499df'
|
||||
'390145e23c45d190b8601a2648ac5562a2dd602629d2030655d55bc9e706617d'
|
||||
'SKIP'
|
||||
'55dd5117c1da17c9ec38d7bc995958958bcc8b7ebcfd81de1d4c7650b85537ab'
|
||||
'1f4a20d6eaaa0d969af93152a65191492400c6aa838fc1c290b0dd29bb6019d8'
|
||||
@ -312,7 +312,7 @@ case $_basever in
|
||||
0012-misc-additions.patch
|
||||
)
|
||||
sha256sums=('dcdf99e43e98330d925016985bfbc7b83c66d367b714b2de0cbbfcbf83d8ca43'
|
||||
'8ecf194fbba49edf9014112f15928f0e869355ebe305b98a99db6f2674a931c2'
|
||||
'fc89eb1b4ede1ab0331df04e33d6581aa3c1e7195aa771b0378cc292c00be892'
|
||||
'SKIP'
|
||||
'458d1ca195f3fee5501683a4b61ef0ed0cfa7e5219eccab3390fb40c0289898a'
|
||||
'1e15fc2ef3fa770217ecc63a220e5df2ddbcf3295eb4a021171e7edd4c6cc898'
|
||||
@ -334,7 +334,7 @@ case $_basever in
|
||||
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
|
||||
'e308292fc42840a2366280ea7cf26314e92b931bb11f04ad4830276fc0326ee1'
|
||||
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
|
||||
'c41bf6a5d2ec52df766ce3019800cf7dd60a62f52811ead6f20dd06765870de2')
|
||||
'cf7c758604f2a99cfcb65129c436e32e2ef7a80fe486f8e55a2206a955acc40a')
|
||||
;;
|
||||
511)
|
||||
opt_ver="5.8%2B"
|
||||
|
@ -1,10 +1,10 @@
|
||||
#!/bin/bash
|
||||
|
||||
ver54=89
|
||||
ver54=90
|
||||
ver57=19
|
||||
ver58=18
|
||||
ver59=16
|
||||
ver510=7
|
||||
ver510=8
|
||||
ver511=rc3
|
||||
|
||||
_tkg_initscript() {
|
||||
|
@ -34,67 +34,6 @@ index bf7ecab5d9e5..142e9dae2837 100644
|
||||
--
|
||||
cgit v1.2.3-1-gf6bb5
|
||||
|
||||
From 0128c7314a4d856461caacfdd528a7bffa03d41e Mon Sep 17 00:00:00 2001
|
||||
From: Josef Bacik <josef@toxicpanda.com>
|
||||
Date: Wed, 23 Dec 2020 14:41:00 -0500
|
||||
Subject: btrfs: Fix 500-2000% performance regression w/ 5.10
|
||||
|
||||
Josef's tentative fix from
|
||||
https://lore.kernel.org/linux-btrfs/0382080a1836a12c2d625f8a5bf899828eba204b.1608752315.git.josef@toxicpanda.com/
|
||||
|
||||
With the conflict fix mentioned in the reply.
|
||||
|
||||
For https://bugs.archlinux.org/task/69077
|
||||
---
|
||||
fs/btrfs/space-info.c | 25 ++++++++++++++++++++++++-
|
||||
1 file changed, 24 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
|
||||
index 64099565ab8f..8a1ce11b6ed8 100644
|
||||
--- a/fs/btrfs/space-info.c
|
||||
+++ b/fs/btrfs/space-info.c
|
||||
@@ -480,6 +480,28 @@ static inline u64 calc_reclaim_items_nr(struct btrfs_fs_info *fs_info,
|
||||
|
||||
#define EXTENT_SIZE_PER_ITEM SZ_256K
|
||||
|
||||
+static void btrfs_writeback_inodes_sb_nr(struct btrfs_fs_info *fs_info,
|
||||
+ unsigned long nr_pages, u64 nr_items)
|
||||
+{
|
||||
+ struct super_block *sb = fs_info->sb;
|
||||
+
|
||||
+ if (down_read_trylock(&sb->s_umount)) {
|
||||
+ writeback_inodes_sb_nr(sb, nr_pages, WB_REASON_FS_FREE_SPACE);
|
||||
+ up_read(&sb->s_umount);
|
||||
+ } else {
|
||||
+ /*
|
||||
+ * We needn't worry the filesystem going from r/w to r/o though
|
||||
+ * we don't acquire ->s_umount mutex, because the filesystem
|
||||
+ * should guarantee the delalloc inodes list be empty after
|
||||
+ * the filesystem is readonly(all dirty pages are written to
|
||||
+ * the disk).
|
||||
+ */
|
||||
+ btrfs_start_delalloc_roots(fs_info, nr_items);
|
||||
+ if (!current->journal_info)
|
||||
+ btrfs_wait_ordered_roots(fs_info, nr_items, 0, (u64)-1);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* shrink metadata reservation for delalloc
|
||||
*/
|
||||
@@ -532,7 +554,8 @@ static void shrink_delalloc(struct btrfs_fs_info *fs_info,
|
||||
|
||||
loops = 0;
|
||||
while ((delalloc_bytes || dio_bytes) && loops < 3) {
|
||||
- btrfs_start_delalloc_roots(fs_info, items);
|
||||
+ unsigned long nr_pages = min(delalloc_bytes, to_reclaim) >> PAGE_SHIFT;
|
||||
+ btrfs_writeback_inodes_sb_nr(fs_info, nr_pages, items);
|
||||
|
||||
loops++;
|
||||
if (wait_ordered && !trans) {
|
||||
--
|
||||
cgit v1.2.3-1-gf6bb5
|
||||
|
||||
From 61e5f6548784e507eb0662a71976a673436e6e3a Mon Sep 17 00:00:00 2001
|
||||
From: Eric Dumazet <edumazet@google.com>
|
||||
Date: Mon, 21 Dec 2020 20:14:02 +0100
|
||||
|
Loading…
Reference in New Issue
Block a user