Merge tag 'dmaengine-5.1-rc1' of git://git.infradead.org/users/vkoul/slave-dma

[sfrench/cifs-2.6.git] / fs / btrfs / root-tree.c

diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c
index 0d2b957ca3a31f4aa44ccfd7c0fd43f006c5922a..893d12fbfda0761573b87acb790732b74c46ddc9 100644 (file)
--- a/fs/btrfs/root-tree.c
+++ b/fs/btrfs/root-tree.c
@@ -263,8 +263,10 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                if (root) {
                        WARN_ON(!test_bit(BTRFS_ROOT_ORPHAN_ITEM_INSERTED,
                                          &root->state));
-                       if (btrfs_root_refs(&root->root_item) == 0)
+                       if (btrfs_root_refs(&root->root_item) == 0) {
+                               set_bit(BTRFS_ROOT_DEAD_TREE, &root->state);
                                btrfs_add_dead_root(root);
+                       }
                        continue;
                }
 
@@ -310,8 +312,10 @@ int btrfs_find_orphan_roots(struct btrfs_fs_info *fs_info)
                        break;
                }
 
-               if (btrfs_root_refs(&root->root_item) == 0)
+               if (btrfs_root_refs(&root->root_item) == 0) {
+                       set_bit(BTRFS_ROOT_DEAD_TREE, &root->state);
                        btrfs_add_dead_root(root);
+               }
        }
 
        btrfs_free_path(path);