path: root/fs/btrfs/disk-io.c
diff options
authorJosef Bacik <>2013-04-20 10:18:27 -0400
committerJosef Bacik <>2013-05-06 15:55:03 -0400
commit79fb65a1f6d97febc232e1e4e56019b0c9208541 (patch)
tree7f2de2444ea17770e172d5fa91e60859eb4405f6 /fs/btrfs/disk-io.c
parent9bb91873e32af6305a1c5239024674e4a5a97e92 (diff)
Btrfs: don't call readahead hook until we have read the entire eb
Martin Steigerwald reported a BUG_ON() where we were given a bogus bytenr to map. Turns out he is using > PAGESIZE leafsizes. The readahead stuff is called every time we do a completion, but we may not have finished reading in all the pages, so the bytenr we read off the node could be completely bogus. Fix this by only calling the readahead hook once all pages have been read in. Thanks, Reported-by: Martin Steigerwald <> Signed-off-by: Josef Bacik <>
Diffstat (limited to 'fs/btrfs/disk-io.c')
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index aab7d89f3ff0..bb6cdbda4f56 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -636,10 +636,9 @@ static int btree_readpage_end_io_hook(struct page *page, u64 start, u64 end,
if (!ret)
- if (test_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags)) {
- clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags);
+ if (reads_done &&
+ test_and_clear_bit(EXTENT_BUFFER_READAHEAD, &eb->bflags))
btree_readahead_hook(root, eb, eb->start, ret);
- }
if (ret) {