Merge tag 'signed-for-4.0' of git://github.com/agraf/linux-2.6

[deliverable/linux.git] / fs / btrfs / reada.c

diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index 5c3fde6571bb2f02d1758530d0f0984dbdde0833..0e7beea92b4cc1279def4a3c61a440ec177ef1a0 100644 (file)
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -461,7 +461,7 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
        spin_unlock(&fs_info->reada_lock);
        btrfs_dev_replace_unlock(&fs_info->dev_replace);
 
-       kfree(bbio);
+       btrfs_put_bbio(bbio);
        return re;
 
 error:
@@ -486,7 +486,7 @@ error:
                kref_put(&zone->refcnt, reada_zone_release);
                spin_unlock(&fs_info->reada_lock);
        }
-       kfree(bbio);
+       btrfs_put_bbio(bbio);
        kfree(re);
        return re_exist;
 }
@@ -721,7 +721,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
 
        atomic_inc(&dev->reada_in_flight);
        ret = reada_tree_block_flagged(fs_info->extent_root, logical,
-                       fs_info->tree_root->nodesize, mirror_num, &eb);
+                       mirror_num, &eb);
        if (ret)
                __readahead_hook(fs_info->extent_root, NULL, logical, ret);
        else if (eb)