1 files changed, 8 insertions, 11 deletions

diff --git a/fs/btrfs/reada.c b/fs/btrfs/reada.c
index b63ae20618fb..0e7beea92b4c 100644
--- a/fs/btrfs/reada.c
+++ b/fs/btrfs/reada.c
@@ -66,7 +66,6 @@ struct reada_extctl {
 struct reada_extent {
         u64                     logical;
         struct btrfs_key        top;
-        u32                     blocksize;
         int                     err;
         struct list_head        extctl;
         int                     refcnt;
@@ -349,7 +348,6 @@ static struct reada_extent *reada_find_extent(struct btrfs_root *root,
 
         blocksize = root->nodesize;
         re->logical = logical;
-        re->blocksize = blocksize;
         re->top = *top;
         INIT_LIST_HEAD(&re->extctl);
         spin_lock_init(&re->lock);
@@ -463,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:
@@ -488,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;
 }
@@ -660,7 +658,6 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
         int mirror_num = 0;
         struct extent_buffer *eb = NULL;
         u64 logical;
-        u32 blocksize;
         int ret;
         int i;
         int need_kick = 0;
@@ -694,7 +691,7 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
                 spin_unlock(&fs_info->reada_lock);
                 return 0;
         }
-        dev->reada_next = re->logical + re->blocksize;
+        dev->reada_next = re->logical + fs_info->tree_root->nodesize;
         re->refcnt++;
 
         spin_unlock(&fs_info->reada_lock);
@@ -709,7 +706,6 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
                 }
         }
         logical = re->logical;
-        blocksize = re->blocksize;
 
         spin_lock(&re->lock);
         if (re->scheduled_for == NULL) {
@@ -724,8 +720,8 @@ static int reada_start_machine_dev(struct btrfs_fs_info *fs_info,
                 return 0;
 
         atomic_inc(&dev->reada_in_flight);
-        ret = reada_tree_block_flagged(fs_info->extent_root, logical, blocksize,
-                         mirror_num, &eb);
+        ret = reada_tree_block_flagged(fs_info->extent_root, logical,
+                        mirror_num, &eb);
         if (ret)
                 __readahead_hook(fs_info->extent_root, NULL, logical, ret);
         else if (eb)
@@ -851,7 +847,7 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                                 break;
                         printk(KERN_DEBUG
                                 "  re: logical %llu size %u empty %d for %lld",
-                                re->logical, re->blocksize,
+                                re->logical, fs_info->tree_root->nodesize,
                                 list_empty(&re->extctl), re->scheduled_for ?
                                 re->scheduled_for->devid : -1);
 
@@ -886,7 +882,8 @@ static void dump_devs(struct btrfs_fs_info *fs_info, int all)
                 }
                 printk(KERN_DEBUG
                         "re: logical %llu size %u list empty %d for %lld",
-                        re->logical, re->blocksize, list_empty(&re->extctl),
+                        re->logical, fs_info->tree_root->nodesize,
+                        list_empty(&re->extctl),
                         re->scheduled_for ? re->scheduled_for->devid : -1);
                 for (i = 0; i < re->nzones; ++i) {
                         printk(KERN_CONT " zone %llu-%llu devs",