aboutsummaryrefslogtreecommitdiffstats
path: root/fs/btrfs/tree-log.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/btrfs/tree-log.c')
-rw-r--r--fs/btrfs/tree-log.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index aa4475e3046b..391bd3ddaed3 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -2757,7 +2757,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
2757 while (1) { 2757 while (1) {
2758 int batch = atomic_read(&root->log_batch); 2758 int batch = atomic_read(&root->log_batch);
2759 /* when we're on an ssd, just kick the log commit out */ 2759 /* when we're on an ssd, just kick the log commit out */
2760 if (!btrfs_test_opt(root, SSD) && 2760 if (!btrfs_test_opt(root->fs_info, SSD) &&
2761 test_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state)) { 2761 test_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state)) {
2762 mutex_unlock(&root->log_mutex); 2762 mutex_unlock(&root->log_mutex);
2763 schedule_timeout_uninterruptible(1); 2763 schedule_timeout_uninterruptible(1);
@@ -5305,7 +5305,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
5305 5305
5306 sb = inode->i_sb; 5306 sb = inode->i_sb;
5307 5307
5308 if (btrfs_test_opt(root, NOTREELOG)) { 5308 if (btrfs_test_opt(root->fs_info, NOTREELOG)) {
5309 ret = 1; 5309 ret = 1;
5310 goto end_no_trans; 5310 goto end_no_trans;
5311 } 5311 }