Btrfs: make ordered operations be handled by multi-task

The process of the ordered operations is similar to the delalloc inode flush, so
we handle them by flush workers.

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>

1 files changed, 14 insertions, 4 deletions

diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c
index 9c466f9f817..259f74eabdb 100644
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
@@ -1412,15 +1412,21 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
         struct btrfs_transaction *cur_trans = trans->transaction;
         struct btrfs_transaction *prev_trans = NULL;
         DEFINE_WAIT(wait);
-        int ret = -EIO;
+        int ret;
         int should_grow = 0;
         unsigned long now = get_seconds();
         int flush_on_commit = btrfs_test_opt(root, FLUSHONCOMMIT);
 
-        btrfs_run_ordered_operations(root, 0);
+        ret = btrfs_run_ordered_operations(root, 0);
+        if (ret) {
+                btrfs_abort_transaction(trans, root, ret);
+                goto cleanup_transaction;
+        }
 
-        if (cur_trans->aborted)
+        if (cur_trans->aborted) {
+                ret = cur_trans->aborted;
                 goto cleanup_transaction;
+        }
 
         /* make a pass through all the delayed refs we have so far
          * any runnings procs may add more while we are here
@@ -1523,7 +1529,11 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans,
                  * it here and no for sure that nothing new will be added
                  * to the list
                  */
-                btrfs_run_ordered_operations(root, 1);
+                ret = btrfs_run_ordered_operations(root, 1);
+                if (ret) {
+                        btrfs_abort_transaction(trans, root, ret);
+                        goto cleanup_transaction;
+                }
 
                 prepare_to_wait(&cur_trans->writer_wait, &wait,
                                 TASK_UNINTERRUPTIBLE);