Commit 23a07867 authored by Chris Mason's avatar Chris Mason
Browse files

Btrfs: Fix mismerge in block header checks 



I had incorrectly disabled the check for the block number being correct
in the header block.

Signed-off-by: default avatarChris Mason <chris.mason@oracle.com>
parent 9623f9a3

fs/btrfs/disk-io.c

+1 −1
Original line number Diff line number Diff line
@@ -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);