From: Greg Kroah-Hartman Date: Fri, 9 Nov 2018 00:21:10 +0000 (-0800) Subject: drop btrfs-cleaner_kthread-doesn-t-need-explicit-freeze.patch from 4.4 X-Git-Tag: v3.18.125~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80f39cbe0bd9d70c979e01091a7890301a55849c;p=thirdparty%2Fkernel%2Fstable-queue.git drop btrfs-cleaner_kthread-doesn-t-need-explicit-freeze.patch from 4.4 --- diff --git a/queue-4.4/btrfs-cleaner_kthread-doesn-t-need-explicit-freeze.patch b/queue-4.4/btrfs-cleaner_kthread-doesn-t-need-explicit-freeze.patch deleted file mode 100644 index f16d8275001..00000000000 --- a/queue-4.4/btrfs-cleaner_kthread-doesn-t-need-explicit-freeze.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7213b724ecae4594c59a1d3ea38375897834ab6d Mon Sep 17 00:00:00 2001 -From: Jiri Kosina -Date: Tue, 15 Mar 2016 11:28:54 +0100 -Subject: btrfs: cleaner_kthread() doesn't need explicit freeze - -[ Upstream commit 838fe1887765f4cc679febea60d87d2a06bd300e ] - -cleaner_kthread() is not marked freezable, and therefore calling -try_to_freeze() in its context is a pointless no-op. - -In addition to that, as has been clearly demonstrated by 80ad623edd2d -("Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()"), it's perfectly -valid / legal for cleaner_kthread() to stay scheduled out in an arbitrary -place during suspend (in that particular example that was waiting for -reading of extent pages), so there is no need to leave any traces of -freezer in this kthread. - -Fixes: 80ad623edd2d ("Revert "btrfs: clear PF_NOFREEZE in cleaner_kthread()") -Fixes: 696249132158 ("btrfs: clear PF_NOFREEZE in cleaner_kthread()") -Signed-off-by: Jiri Kosina -Signed-off-by: David Sterba -Signed-off-by: Sasha Levin ---- - fs/btrfs/disk-io.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c -index ae6e3a30e61e..a2001abbe379 100644 ---- a/fs/btrfs/disk-io.c -+++ b/fs/btrfs/disk-io.c -@@ -1820,7 +1820,7 @@ static int cleaner_kthread(void *arg) - */ - btrfs_delete_unused_bgs(root->fs_info); - sleep: -- if (!try_to_freeze() && !again) { -+ if (!again) { - set_current_state(TASK_INTERRUPTIBLE); - if (!kthread_should_stop()) - schedule(); --- -2.17.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 82b4fd194c4..2ff9990a755 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -23,7 +23,6 @@ ser_gigaset-use-container_of-instead-of-detour.patch tracing-skip-more-functions-when-doing-stack-tracing.patch arm-dts-apq8064-add-ahci-ports-implemented-mask.patch x86-mm-pat-prevent-hang-during-boot-when-mapping-pag.patch -btrfs-cleaner_kthread-doesn-t-need-explicit-freeze.patch radix-tree-fix-radix_tree_iter_retry-for-tagged-iter.patch af_iucv-move-sockaddr-length-checks-to-before-access.patch net-mlx4_en-resolve-dividing-by-zero-in-32-bit-syste.patch