diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-03-15 11:28:59 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-03-22 10:08:47 +0100 |
| commit | ce63f891e1a87ae79c4325dad5f512e8d6a8a78e (patch) | |
| tree | d73406715785b0ce265bd85d5a54d22109420160 /fs | |
| parent | 838fe1887765f4cc679febea60d87d2a06bd300e (diff) | |
| download | linux-stable-ce63f891e1a87ae79c4325dad5f512e8d6a8a78e.tar.gz linux-stable-ce63f891e1a87ae79c4325dad5f512e8d6a8a78e.tar.bz2 linux-stable-ce63f891e1a87ae79c4325dad5f512e8d6a8a78e.zip | |
btrfs: transaction_kthread() is not freezable
transaction_kthread() is calling try_to_freeze(), but that's just an
expeinsive no-op given the fact that the thread is not marked freezable.
After removing this, disk-io.c is now independent on freezer API.
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index ff36a33ee9ca..81966676a26b 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -25,7 +25,6 @@ #include <linux/buffer_head.h> #include <linux/workqueue.h> #include <linux/kthread.h> -#include <linux/freezer.h> #include <linux/slab.h> #include <linux/migrate.h> #include <linux/ratelimit.h> @@ -1928,14 +1927,12 @@ sleep: if (unlikely(test_bit(BTRFS_FS_STATE_ERROR, &root->fs_info->fs_state))) btrfs_cleanup_transaction(root); - if (!try_to_freeze()) { - set_current_state(TASK_INTERRUPTIBLE); - if (!kthread_should_stop() && - (!btrfs_transaction_blocked(root->fs_info) || - cannot_commit)) - schedule_timeout(delay); - __set_current_state(TASK_RUNNING); - } + set_current_state(TASK_INTERRUPTIBLE); + if (!kthread_should_stop() && + (!btrfs_transaction_blocked(root->fs_info) || + cannot_commit)) + schedule_timeout(delay); + __set_current_state(TASK_RUNNING); } while (!kthread_should_stop()); return 0; } |