1 files changed, 22 insertions, 27 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index e2f45fc02610..9e1f2cd5e67a 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -20,13 +20,11 @@
 #include <linux/slab.h>
 #include <linux/blkdev.h>
 #include <linux/list_sort.h>
-#include "ctree.h"
-#include "transaction.h"
+#include "tree-log.h"
 #include "disk-io.h"
 #include "locking.h"
 #include "print-tree.h"
 #include "backref.h"
-#include "tree-log.h"
 #include "hash.h"
 
 /* magic values for the inode_only field in btrfs_log_inode:
@@ -144,17 +142,15 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
 
         mutex_lock(&root->log_mutex);
         if (root->log_root) {
-                if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
-                    trans->transid) {
+                if (btrfs_need_log_full_commit(root->fs_info, trans)) {
                         ret = -EAGAIN;
                         goto out;
                 }
-
                 if (!root->log_start_pid) {
                         root->log_start_pid = current->pid;
-                        root->log_multiple_pids = false;
+                        clear_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state);
                 } else if (root->log_start_pid != current->pid) {
-                        root->log_multiple_pids = true;
+                        set_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state);
                 }
 
                 atomic_inc(&root->log_batch);
@@ -181,7 +177,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans,
                 if (ret)
                         goto out;
         }
-        root->log_multiple_pids = false;
+        clear_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state);
         root->log_start_pid = current->pid;
         atomic_inc(&root->log_batch);
         atomic_inc(&root->log_writers);
@@ -2500,7 +2496,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
         while (1) {
                 int batch = atomic_read(&root->log_batch);
                 /* when we're on an ssd, just kick the log commit out */
-                if (!btrfs_test_opt(root, SSD) && root->log_multiple_pids) {
+                if (!btrfs_test_opt(root, SSD) &&
+                    test_bit(BTRFS_ROOT_MULTI_LOG_TASKS, &root->state)) {
                         mutex_unlock(&root->log_mutex);
                         schedule_timeout_uninterruptible(1);
                         mutex_lock(&root->log_mutex);
@@ -2511,8 +2508,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
         }
 
         /* bail out if we need to do a full commit */
-        if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
-            trans->transid) {
+        if (btrfs_need_log_full_commit(root->fs_info, trans)) {
                 ret = -EAGAIN;
                 btrfs_free_logged_extents(log, log_transid);
                 mutex_unlock(&root->log_mutex);
@@ -2533,8 +2529,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                 blk_finish_plug(&plug);
                 btrfs_abort_transaction(trans, root, ret);
                 btrfs_free_logged_extents(log, log_transid);
-                ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
-                                                                trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
                 mutex_unlock(&root->log_mutex);
                 goto out;
         }
@@ -2577,8 +2572,8 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                         list_del_init(&root_log_ctx.list);
 
                 blk_finish_plug(&plug);
-                ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
-                                                                trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
+
                 if (ret != -ENOSPC) {
                         btrfs_abort_transaction(trans, root, ret);
                         mutex_unlock(&log_root_tree->log_mutex);
@@ -2622,8 +2617,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
          * now that we've moved on to the tree of log tree roots,
          * check the full commit flag again
          */
-        if (ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) ==
-            trans->transid) {
+        if (btrfs_need_log_full_commit(root->fs_info, trans)) {
                 blk_finish_plug(&plug);
                 btrfs_wait_marked_extents(log, &log->dirty_log_pages, mark);
                 btrfs_free_logged_extents(log, log_transid);
@@ -2637,8 +2631,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
                                          EXTENT_DIRTY | EXTENT_NEW);
         blk_finish_plug(&plug);
         if (ret) {
-                ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
-                                                                trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
                 btrfs_abort_transaction(trans, root, ret);
                 btrfs_free_logged_extents(log, log_transid);
                 mutex_unlock(&log_root_tree->log_mutex);
@@ -2667,8 +2660,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
          */
         ret = write_ctree_super(trans, root->fs_info->tree_root, 1);
         if (ret) {
-                ACCESS_ONCE(root->fs_info->last_trans_log_full_commit) =
-                                                                trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
                 btrfs_abort_transaction(trans, root, ret);
                 goto out_wake_log_root;
         }
@@ -2886,7 +2878,7 @@ fail:
 out_unlock:
         mutex_unlock(&BTRFS_I(dir)->log_mutex);
         if (ret == -ENOSPC) {
-                root->fs_info->last_trans_log_full_commit = trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
                 ret = 0;
         } else if (ret < 0)
                 btrfs_abort_transaction(trans, root, ret);
@@ -2919,7 +2911,7 @@ int btrfs_del_inode_ref_in_log(struct btrfs_trans_handle *trans,
                                   dirid, &index);
         mutex_unlock(&BTRFS_I(inode)->log_mutex);
         if (ret == -ENOSPC) {
-                root->fs_info->last_trans_log_full_commit = trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
                 ret = 0;
         } else if (ret < 0 && ret != -ENOENT)
                 btrfs_abort_transaction(trans, root, ret);
@@ -4130,8 +4122,7 @@ static noinline int check_parent_dirs_for_sync(struct btrfs_trans_handle *trans,
                          * make sure any commits to the log are forced
                          * to be full commits
                          */
-                        root->fs_info->last_trans_log_full_commit =
-                                trans->transid;
+                        btrfs_set_log_full_commit(root->fs_info, trans);
                         ret = 1;
                         break;
                 }
@@ -4177,6 +4168,10 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
                 goto end_no_trans;
         }
 
+        /*
+         * The prev transaction commit doesn't complete, we need do
+         * full commit by ourselves.
+         */
         if (root->fs_info->last_trans_log_full_commit >
             root->fs_info->last_trans_committed) {
                 ret = 1;
@@ -4246,7 +4241,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,
 end_trans:
         dput(old_parent);
         if (ret < 0) {
-                root->fs_info->last_trans_log_full_commit = trans->transid;
+                btrfs_set_log_full_commit(root->fs_info, trans);
                 ret = 1;
         }