1 files changed, 17 insertions, 22 deletions

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 34cd83184c4a..a04707f740d6 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -683,7 +683,8 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
         int lock = (trans->type != TRANS_JOIN_NOLOCK);
         int err = 0;
 
-        if (--trans->use_count) {
+        if (trans->use_count > 1) {
+                trans->use_count--;
                 trans->block_rsv = trans->orig_rsv;
                 return 0;
         }
@@ -731,17 +732,10 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans,
         }
 
         if (lock && ACCESS_ONCE(cur_trans->state) == TRANS_STATE_BLOCKED) {
-                if (throttle) {
-                        /*
-                         * We may race with somebody else here so end up having
-                         * to call end_transaction on ourselves again, so inc
-                         * our use_count.
-                         */
-                        trans->use_count++;
+                if (throttle)
                         return btrfs_commit_transaction(trans, root);
-                } else {
+                else
                         wake_up_process(info->transaction_kthread);
-                }
         }
 
         if (trans->type & __TRANS_FREEZABLE)
@@ -1578,10 +1572,9 @@ static void cleanup_transaction(struct btrfs_trans_handle *trans,
 
         trace_btrfs_transaction_commit(root);
 
-        btrfs_scrub_continue(root);
-
         if (current->journal_info == trans)
                 current->journal_info = NULL;
+        btrfs_scrub_cancel(root->fs_info);
 
         kmem_cache_free(btrfs_trans_handle_cachep, trans);
 }
@@ -1621,7 +1614,7 @@ static int btrfs_flush_all_pending_stuffs(struct btrfs_trans_handle *trans,
 static inline int btrfs_start_delalloc_flush(struct btrfs_fs_info *fs_info)
 {
         if (btrfs_test_opt(fs_info->tree_root, FLUSHONCOMMIT))
-                return btrfs_start_delalloc_roots(fs_info, 1);
+                return btrfs_start_delalloc_roots(fs_info, 1, -1);
         return 0;
 }
 
@@ -1754,7 +1747,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         /* ->aborted might be set after the previous check, so check it */
         if (unlikely(ACCESS_ONCE(cur_trans->aborted))) {
                 ret = cur_trans->aborted;
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
         /*
          * the reloc mutex makes sure that we stop
@@ -1771,7 +1764,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         ret = create_pending_snapshots(trans, root->fs_info);
         if (ret) {
                 mutex_unlock(&root->fs_info->reloc_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         /*
@@ -1787,13 +1780,13 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         ret = btrfs_run_delayed_items(trans, root);
         if (ret) {
                 mutex_unlock(&root->fs_info->reloc_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         ret = btrfs_run_delayed_refs(trans, root, (unsigned long)-1);
         if (ret) {
                 mutex_unlock(&root->fs_info->reloc_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         /*
@@ -1823,7 +1816,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         if (ret) {
                 mutex_unlock(&root->fs_info->tree_log_mutex);
                 mutex_unlock(&root->fs_info->reloc_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         /*
@@ -1844,7 +1837,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         if (ret) {
                 mutex_unlock(&root->fs_info->tree_log_mutex);
                 mutex_unlock(&root->fs_info->reloc_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         /*
@@ -1855,7 +1848,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                 ret = cur_trans->aborted;
                 mutex_unlock(&root->fs_info->tree_log_mutex);
                 mutex_unlock(&root->fs_info->reloc_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         btrfs_prepare_extent_commit(trans, root);
@@ -1891,13 +1884,13 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                 btrfs_error(root->fs_info, ret,
                             "Error while writing out transaction");
                 mutex_unlock(&root->fs_info->tree_log_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         ret = write_ctree_super(trans, root, 0);
         if (ret) {
                 mutex_unlock(&root->fs_info->tree_log_mutex);
-                goto cleanup_transaction;
+                goto scrub_continue;
         }
 
         /*
@@ -1940,6 +1933,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
 
         return ret;
 
+scrub_continue:
+        btrfs_scrub_continue(root);
 cleanup_transaction:
         btrfs_trans_release_metadata(trans, root);
         trans->block_rsv = NULL;