3 files changed, 10 insertions, 2 deletions

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 0632832d4446..063e48587126 100644
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -1413,6 +1413,13 @@ struct btrfs_fs_info {
          * before jumping into the main commit.
          */
         struct mutex ordered_operations_mutex;
+
+        /*
+         * Same as ordered_operations_mutex except this is for ordered extents
+         * and not the operations.
+         */
+        struct mutex ordered_extent_flush_mutex;
+
         struct rw_semaphore extent_commit_sem;
 
         struct rw_semaphore cleanup_work_sem;
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 572e21eb644c..68391ecf2c59 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2277,6 +2277,7 @@ int open_ctree(struct super_block *sb,
 
 
         mutex_init(&fs_info->ordered_operations_mutex);
+        mutex_init(&fs_info->ordered_extent_flush_mutex);
         mutex_init(&fs_info->tree_log_mutex);
         mutex_init(&fs_info->chunk_mutex);
         mutex_init(&fs_info->transaction_kthread_mutex);
diff --git a/fs/btrfs/ordered-data.c b/fs/btrfs/ordered-data.c
index 81369827e514..b52b2c4010c2 100644
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
@@ -671,7 +671,7 @@ int btrfs_run_ordered_operations(struct btrfs_trans_handle *trans,
         INIT_LIST_HEAD(&splice);
         INIT_LIST_HEAD(&works);
 
-        mutex_lock(&root->fs_info->ordered_operations_mutex);
+        mutex_lock(&root->fs_info->ordered_extent_flush_mutex);
         spin_lock(&root->fs_info->ordered_root_lock);
         list_splice_init(&cur_trans->ordered_operations, &splice);
         while (!list_empty(&splice)) {
@@ -718,7 +718,7 @@ out:
                 list_del_init(&work->list);
                 btrfs_wait_and_free_delalloc_work(work);
         }
-        mutex_unlock(&root->fs_info->ordered_operations_mutex);
+        mutex_unlock(&root->fs_info->ordered_extent_flush_mutex);
         return ret;
 }