From 79264be54cbd6a9cc25c9b873362f86b08cc16de Mon Sep 17 00:00:00 2001 From: Josef Bacik Date: Sat, 20 Apr 2013 10:18:27 -0400 Subject: [PATCH] --- yaml --- r: 374889 b: refs/heads/master c: 79fb65a1f6d97febc232e1e4e56019b0c9208541 h: refs/heads/master i: 374887: 484abd613060decc1700181cf095d1dae9709a24 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8d23dd9eff79..8c3e7415eb3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9bb91873e32af6305a1c5239024674e4a5a97e92 +refs/heads/master: 79fb65a1f6d97febc232e1e4e56019b0c9208541 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index aab7d89f3ff0..bb6cdbda4f56 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/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) set_extent_buffer_uptodate(eb); err: - 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) { /*