summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorChris Mason <chris.mason@oracle.com>2008-09-12 08:57:47 -0400
committerChris Mason <chris.mason@oracle.com>2008-09-25 11:04:07 -0400
commit23a07867b78ee0f33b01466e52bb608c336b26ee (patch)
treeeef52f02008281b9f20e8837f2914370e88b1c0a /fs
parent9623f9a3894ec95fe140ee5460bb840ac53bc6a0 (diff)
downloadblackbird-op-linux-23a07867b78ee0f33b01466e52bb608c336b26ee.tar.gz
blackbird-op-linux-23a07867b78ee0f33b01466e52bb608c336b26ee.zip
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: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 57fbf107e59f..f6f7821d43a5 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -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);
OpenPOWER on IntegriCloud