]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Btrfs: Fix mismerge in block header checks
authorChris Mason <chris.mason@oracle.com>
Fri, 12 Sep 2008 12:57:47 +0000 (08:57 -0400)
committerChris Mason <chris.mason@oracle.com>
Thu, 25 Sep 2008 15:04:07 +0000 (11:04 -0400)
I had incorrectly disabled the check for the block number being correct
in the header block.

Signed-off-by: Chris Mason <chris.mason@oracle.com>
fs/btrfs/disk-io.c

index 57fbf107e59f7906089ad833c580f721582c745a..f6f7821d43a5248478c0f5ccfa1bcb97c6e22410 100644 (file)
@@ -346,7 +346,7 @@ int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end,
        eb = alloc_extent_buffer(tree, start, len, page, GFP_NOFS);
 
        found_start = btrfs_header_bytenr(eb);
-       if (0 && found_start != start) {
+       if (found_start != start) {
                printk("bad tree block start %llu %llu\n",
                       (unsigned long long)found_start,
                       (unsigned long long)eb->start);