p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Jiri Kosina 2016-03-15 11:28:59 +01:00 committed by David Sterba
parent 838fe18877
commit ce63f891e1
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/btrfs/disk-io.c
View File

@ -25,7 +25,6 @@
#include <linux/buffer_head.h> #include <linux/buffer_head.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/freezer.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/migrate.h> #include <linux/migrate.h>
#include <linux/ratelimit.h> #include <linux/ratelimit.h>
@ -1928,14 +1927,12 @@ static int transaction_kthread(void *arg)
if (unlikely(test_bit(BTRFS_FS_STATE_ERROR, if (unlikely(test_bit(BTRFS_FS_STATE_ERROR,
&root->fs_info->fs_state))) &root->fs_info->fs_state)))
btrfs_cleanup_transaction(root); btrfs_cleanup_transaction(root);
if (!try_to_freeze()) { set_current_state(TASK_INTERRUPTIBLE);
set_current_state(TASK_INTERRUPTIBLE); if (!kthread_should_stop() &&
if (!kthread_should_stop() && (!btrfs_transaction_blocked(root->fs_info) ||
(!btrfs_transaction_blocked(root->fs_info) || cannot_commit))
cannot_commit)) schedule_timeout(delay);
schedule_timeout(delay); __set_current_state(TASK_RUNNING);
__set_current_state(TASK_RUNNING);
}
} while (!kthread_should_stop()); } while (!kthread_should_stop());
return 0; return 0;
} }