Btrfs: allocator optimizations, truncate readahead

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / fs / btrfs / disk-io.c

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 678456d1e2f9c4a68d813eafcac6d705114b7637..4c0262b57664bd1a347d5bffa595811459b76486 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -257,24 +257,30 @@ static struct address_space_operations btree_aops = {
 int readahead_tree_block(struct btrfs_root *root, u64 blocknr)
 {
        struct buffer_head *bh = NULL;
+       int ret = 0;
 
        bh = btrfs_find_create_tree_block(root, blocknr);
        if (!bh)
                return 0;
-       if (buffer_uptodate(bh))
+       if (buffer_uptodate(bh)) {
+               ret = 1;
                goto done;
-       if (test_set_buffer_locked(bh))
+       }
+       if (test_set_buffer_locked(bh)) {
+               ret = 1;
                goto done;
+       }
        if (!buffer_uptodate(bh)) {
                get_bh(bh);
                bh->b_end_io = end_buffer_read_sync;
                submit_bh(READ, bh);
        } else {
                unlock_buffer(bh);
+               ret = 1;
        }
 done:
        brelse(bh);
-       return 0;
+       return ret;
 }
 
 struct buffer_head *read_tree_block(struct btrfs_root *root, u64 blocknr)