]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
btrfs: cleaner_kthread() doesn't need explicit freeze
authorJiri Kosina <jkosina@suse.cz>
Tue, 15 Mar 2016 10:28:54 +0000 (11:28 +0100)
committerDavid Sterba <dsterba@suse.com>
Tue, 22 Mar 2016 09:08:47 +0000 (10:08 +0100)
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 <jkosina@suse.cz>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/disk-io.c

index 8579b35bb16029c19cb0c3e19e0d836e6ba53805..ff36a33ee9caaef54092ae5b5b9483584fdfdd75 100644 (file)
@@ -1838,7 +1838,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();