fix up queue-4.19/btrfs-detect-unbalanced-tree-with-empty-leaf-before-crashing-btree...

diff --git a/queue-4.19/btrfs-detect-unbalanced-tree-with-empty-leaf-before-crashing-btree-operations.patch b/queue-4.19/btrfs-detect-unbalanced-tree-with-empty-leaf-before-crashing-btree-operations.patch
index 94886f5099d906ef351d4ada6028b540d4a4f3d3..ccc8556a4373786fd7eb9db7ba37935517015d8f 100644 (file)
--- a/queue-4.19/btrfs-detect-unbalanced-tree-with-empty-leaf-before-crashing-btree-operations.patch
+++ b/queue-4.19/btrfs-detect-unbalanced-tree-with-empty-leaf-before-crashing-btree-operations.patch
@@ -109,16 +109,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        else
 --- a/fs/btrfs/tree-checker.c
 +++ b/fs/btrfs/tree-checker.c
-@@ -169,6 +169,12 @@ static int check_extent_data_item(struct
-                               btrfs_file_extent_ram_bytes(leaf, fi));
+@@ -509,6 +509,12 @@ static int check_leaf(struct btrfs_fs_in
+                                   owner);
                        return -EUCLEAN;
                }
 +              /* Unknown tree */
 +              if (owner == 0) {
-+                      generic_err(leaf, 0,
++                      generic_err(fs_info, leaf, 0,
 +                              "invalid owner, root 0 is not defined");
 +                      return -EUCLEAN;
 +              }
-               return 0;
-       }
- 
+               key.objectid = owner;
+               key.type = BTRFS_ROOT_ITEM_KEY;
+               key.offset = (u64)-1;