bump to latest version
This commit is contained in:
Tobias Powalowski
parent
20d56ca2c7
commit
855e3645cd
@ -1,78 +0,0 @@
|
|||||||
From 80ad623edd2d0ccb47d85357ee31c97e6c684e82 Mon Sep 17 00:00:00 2001
|
|
||||||
From: David Sterba <dsterba@suse.com>
|
|
||||||
Date: Mon, 25 Jan 2016 11:02:06 +0100
|
|
||||||
Subject: Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"
|
|
||||||
|
|
||||||
This reverts commit 696249132158014d594896df3a81390616069c5c. The
|
|
||||||
cleaner thread can block freezing when there's a snapshot cleaning in
|
|
||||||
progress and the other threads get suspended first. From the logs
|
|
||||||
provided by Martin we're waiting for reading extent pages:
|
|
||||||
|
|
||||||
kernel: PM: Syncing filesystems ... done.
|
|
||||||
kernel: Freezing user space processes ... (elapsed 0.015 seconds) done.
|
|
||||||
kernel: Freezing remaining freezable tasks ...
|
|
||||||
kernel: Freezing of tasks failed after 20.003 seconds (1 tasks refusing to freeze, wq_busy=0):
|
|
||||||
kernel: btrfs-cleaner D ffff88033dd13bc0 0 152 2 0x00000000
|
|
||||||
kernel: ffff88032ebc2e00 ffff88032e750000 ffff88032e74fa50 7fffffffffffffff
|
|
||||||
kernel: ffffffff814a58df 0000000000000002 ffffea000934d580 ffffffff814a5451
|
|
||||||
kernel: 7fffffffffffffff ffffffff814a6e8f 0000000000000000 0000000000000020
|
|
||||||
kernel: Call Trace:
|
|
||||||
kernel: [<ffffffff814a58df>] ? bit_wait+0x2c/0x2c
|
|
||||||
kernel: [<ffffffff814a5451>] ? schedule+0x6f/0x7c
|
|
||||||
kernel: [<ffffffff814a6e8f>] ? schedule_timeout+0x2f/0xd8
|
|
||||||
kernel: [<ffffffff81076f94>] ? timekeeping_get_ns+0xa/0x2e
|
|
||||||
kernel: [<ffffffff81077603>] ? ktime_get+0x36/0x44
|
|
||||||
kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2
|
|
||||||
kernel: [<ffffffff814a4f6c>] ? io_schedule_timeout+0x94/0xf2
|
|
||||||
kernel: [<ffffffff814a590b>] ? bit_wait_io+0x2c/0x30
|
|
||||||
kernel: [<ffffffff814a5694>] ? __wait_on_bit+0x41/0x73
|
|
||||||
kernel: [<ffffffff8109eba8>] ? wait_on_page_bit+0x6d/0x72
|
|
||||||
kernel: [<ffffffff8105d718>] ? autoremove_wake_function+0x2a/0x2a
|
|
||||||
kernel: [<ffffffff811a02d7>] ? read_extent_buffer_pages+0x1bd/0x203
|
|
||||||
kernel: [<ffffffff8117d9e9>] ? free_root_pointers+0x4c/0x4c
|
|
||||||
kernel: [<ffffffff8117e831>] ? btree_read_extent_buffer_pages.constprop.57+0x5a/0xe9
|
|
||||||
kernel: [<ffffffff8117f4f3>] ? read_tree_block+0x2d/0x45
|
|
||||||
kernel: [<ffffffff8116782a>] ? read_block_for_search.isra.34+0x22a/0x26b
|
|
||||||
kernel: [<ffffffff811656c3>] ? btrfs_set_path_blocking+0x1e/0x4a
|
|
||||||
kernel: [<ffffffff8116919b>] ? btrfs_search_slot+0x648/0x736
|
|
||||||
kernel: [<ffffffff81170559>] ? btrfs_lookup_extent_info+0xb7/0x2c7
|
|
||||||
kernel: [<ffffffff81170ee5>] ? walk_down_proc+0x9c/0x1ae
|
|
||||||
kernel: [<ffffffff81171c9d>] ? walk_down_tree+0x40/0xa4
|
|
||||||
kernel: [<ffffffff8117375f>] ? btrfs_drop_snapshot+0x2da/0x664
|
|
||||||
kernel: [<ffffffff8104ff21>] ? finish_task_switch+0x126/0x167
|
|
||||||
kernel: [<ffffffff811850f8>] ? btrfs_clean_one_deleted_snapshot+0xa6/0xb0
|
|
||||||
kernel: [<ffffffff8117eaba>] ? cleaner_kthread+0x13e/0x17b
|
|
||||||
kernel: [<ffffffff8117e97c>] ? btrfs_item_end+0x33/0x33
|
|
||||||
kernel: [<ffffffff8104d256>] ? kthread+0x95/0x9d
|
|
||||||
kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16
|
|
||||||
kernel: [<ffffffff814a7b5f>] ? ret_from_fork+0x3f/0x70
|
|
||||||
kernel: [<ffffffff8104d1c1>] ? kthread_parkme+0x16/0x16
|
|
||||||
|
|
||||||
As this affects a released kernel (4.4) we need a minimal fix for
|
|
||||||
stable kernels.
|
|
||||||
|
|
||||||
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=108361
|
|
||||||
Reported-by: Martin Ziegler <ziegler@uni-freiburg.de>
|
|
||||||
CC: stable@vger.kernel.org # 4.4
|
|
||||||
CC: Jiri Kosina <jkosina@suse.cz>
|
|
||||||
Signed-off-by: David Sterba <dsterba@suse.com>
|
|
||||||
Signed-off-by: Chris Mason <clm@fb.com>
|
|
||||||
---
|
|
||||||
fs/btrfs/disk-io.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
|
|
||||||
index 26ef141..404e894 100644
|
|
||||||
--- a/fs/btrfs/disk-io.c
|
|
||||||
+++ b/fs/btrfs/disk-io.c
|
|
||||||
@@ -1787,7 +1787,6 @@ static int cleaner_kthread(void *arg)
|
|
||||||
int again;
|
|
||||||
struct btrfs_trans_handle *trans;
|
|
||||||
|
|
||||||
- set_freezable();
|
|
||||||
do {
|
|
||||||
again = 0;
|
|
||||||
|
|
||||||
--
|
|
||||||
cgit v0.12
|
|
||||||
|
|
||||||
@ -1,39 +0,0 @@
|
|||||||
From 3e85286e75224fa3f08bdad20e78c8327742634e Mon Sep 17 00:00:00 2001
|
|
||||||
From: Dave Chinner <david@fromorbit.com>
|
|
||||||
Date: Tue, 19 Jan 2016 08:21:46 +1100
|
|
||||||
Subject: Revert "xfs: clear PF_NOFREEZE for xfsaild kthread"
|
|
||||||
|
|
||||||
This reverts commit 24ba16bb3d499c49974669cd8429c3e4138ab102 as it
|
|
||||||
prevents machines from suspending. This regression occurs when the
|
|
||||||
xfsaild is idle on entry to suspend, and so there s no activity to
|
|
||||||
wake it from it's idle sleep and hence see that it is supposed to
|
|
||||||
freeze. Hence the freezer times out waiting for it and suspend is
|
|
||||||
cancelled.
|
|
||||||
|
|
||||||
There is no obvious fix for this short of freezing the filesystem
|
|
||||||
properly, so revert this change for now.
|
|
||||||
|
|
||||||
cc: <stable@vger.kernel.org> # 4.4
|
|
||||||
Signed-off-by: Dave Chinner <david@fromorbit.com>
|
|
||||||
Acked-by: Jiri Kosina <jkosina@suse.cz>
|
|
||||||
Reviewed-by: Brian Foster <bfoster@redhat.com>
|
|
||||||
Signed-off-by: Dave Chinner <david@fromorbit.com>
|
|
||||||
---
|
|
||||||
fs/xfs/xfs_trans_ail.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c
|
|
||||||
index aa67339..4f18fd9 100644
|
|
||||||
--- a/fs/xfs/xfs_trans_ail.c
|
|
||||||
+++ b/fs/xfs/xfs_trans_ail.c
|
|
||||||
@@ -497,7 +497,6 @@ xfsaild(
|
|
||||||
long tout = 0; /* milliseconds */
|
|
||||||
|
|
||||||
current->flags |= PF_MEMALLOC;
|
|
||||||
- set_freezable();
|
|
||||||
|
|
||||||
while (!kthread_should_stop()) {
|
|
||||||
if (tout && tout <= 20)
|
|
||||||
--
|
|
||||||
cgit v0.12
|
|
||||||
|
|
||||||
16
PKGBUILD
16
PKGBUILD
@ -4,7 +4,7 @@
|
|||||||
pkgbase=linux # Build stock -ARCH kernel
|
pkgbase=linux # Build stock -ARCH kernel
|
||||||
#pkgbase=linux-custom # Build kernel with a different name
|
#pkgbase=linux-custom # Build kernel with a different name
|
||||||
_srcname=linux-4.4
|
_srcname=linux-4.4
|
||||||
pkgver=4.4.2
|
pkgver=4.4.3
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
url="http://www.kernel.org/"
|
url="http://www.kernel.org/"
|
||||||
@ -20,21 +20,17 @@ source=("https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
|
|||||||
# standard config files for mkinitcpio ramdisk
|
# standard config files for mkinitcpio ramdisk
|
||||||
'linux.preset'
|
'linux.preset'
|
||||||
'change-default-console-loglevel.patch'
|
'change-default-console-loglevel.patch'
|
||||||
'0001-sdhci-revert.patch'
|
'0001-sdhci-revert.patch')
|
||||||
'0001-4.4-revert-btrfs.patch'
|
|
||||||
'0001-4.4-revert-xfs.patch')
|
|
||||||
|
|
||||||
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
|
sha256sums=('401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'5c55d48ca6b2a9b89ed786e656ed17f9a86192eba6d209fa408e0bca8de57b9c'
|
'4a24c79c40b2cb820ce9f22d44f31edcbde5971432753ab0289772946ed05b7b'
|
||||||
'SKIP'
|
'SKIP'
|
||||||
'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
|
'fbbae1d873900e84d1b7ef00593fbb94fc79f078a34b22ee824bab8b0a92be64'
|
||||||
'756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a'
|
'756a168bbc3bb582f0df45b977c32af53658f21d62fe15171c9ac85f52d8852a'
|
||||||
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
|
||||||
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
|
||||||
'5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
|
'5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375')
|
||||||
'51586b733e9f178bebe577258b6057b035eded516ffe8bf8bbb26cb0b26c4958'
|
|
||||||
'ffbfaa192d17bfc7c6293aa9a07efe57f65177051ae3d8033d5e45a7bca2e0ad')
|
|
||||||
validpgpkeys=(
|
validpgpkeys=(
|
||||||
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
|
||||||
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
|
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
|
||||||
@ -56,10 +52,6 @@ prepare() {
|
|||||||
# https://bugzilla.kernel.org/show_bug.cgi?id=106541
|
# https://bugzilla.kernel.org/show_bug.cgi?id=106541
|
||||||
patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch"
|
patch -Rp1 -i "${srcdir}/0001-sdhci-revert.patch"
|
||||||
|
|
||||||
# #47757 fix broken suspend from btrfs and xfs
|
|
||||||
patch -Np1 -i "${srcdir}/0001-4.4-revert-xfs.patch"
|
|
||||||
patch -Np1 -i "${srcdir}/0001-4.4-revert-btrfs.patch"
|
|
||||||
|
|
||||||
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
|
# set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
|
||||||
# remove this when a Kconfig knob is made available by upstream
|
# remove this when a Kconfig knob is made available by upstream
|
||||||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user