Add generation number to btrfs_header, readdir fixes, hash collision fixes

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 1 insertions, 5 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 2f1eb4ae4e1d..3dea757d4cbb 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -11,11 +11,7 @@ static int check_tree_block(struct btrfs_root *root, struct buffer_head *buf)
                 BUG();
         if (root->node && btrfs_header_parentid(&node->header) !=
             btrfs_header_parentid(btrfs_buffer_header(root->node))) {
-                printk("block %Lu parentids don't match buf %Lu, root %Lu\n",
-                       buf->b_blocknr,
-                       btrfs_header_parentid(&node->header),
-                       btrfs_header_parentid(btrfs_buffer_header(root->node)));
-                WARN_ON(1);
+                BUG();
         }
         return 0;
 }