1 files changed, 19 insertions, 4 deletions

diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index 85fd86ea9830..619742d37166 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -1951,12 +1951,28 @@ enum btrfs_orphan_cleanup_state {
 void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
                               struct btrfs_root *root)
 {
+        struct btrfs_block_rsv *block_rsv;
         int ret;
 
         if (!list_empty(&root->orphan_list) ||
             root->orphan_cleanup_state != ORPHAN_CLEANUP_DONE)
                 return;
 
+        spin_lock(&root->orphan_lock);
+        if (!list_empty(&root->orphan_list)) {
+                spin_unlock(&root->orphan_lock);
+                return;
+        }
+
+        if (root->orphan_cleanup_state != ORPHAN_CLEANUP_DONE) {
+                spin_unlock(&root->orphan_lock);
+                return;
+        }
+
+        block_rsv = root->orphan_block_rsv;
+        root->orphan_block_rsv = NULL;
+        spin_unlock(&root->orphan_lock);
+
         if (root->orphan_item_inserted &&
             btrfs_root_refs(&root->root_item) > 0) {
                 ret = btrfs_del_orphan_item(trans, root->fs_info->tree_root,
@@ -1965,10 +1981,9 @@ void btrfs_orphan_commit_root(struct btrfs_trans_handle *trans,
                 root->orphan_item_inserted = 0;
         }
 
-        if (root->orphan_block_rsv) {
-                WARN_ON(root->orphan_block_rsv->size > 0);
-                btrfs_free_block_rsv(root, root->orphan_block_rsv);
-                root->orphan_block_rsv = NULL;
+        if (block_rsv) {
+                WARN_ON(block_rsv->size > 0);
+                btrfs_free_block_rsv(root, block_rsv);
         }
 }