1 files changed, 13 insertions, 12 deletions

diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c
index 4678f03e878e..fa35cdc46494 100644
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
@@ -1350,7 +1350,7 @@ static int scrub_setup_recheck_block(struct scrub_block *original_sblock,
                 recover->bbio = bbio;
                 recover->map_length = mapped_length;
 
-                BUG_ON(page_index >= SCRUB_PAGES_PER_RD_BIO);
+                BUG_ON(page_index >= SCRUB_MAX_PAGES_PER_BLOCK);
 
                 nmirrors = min(scrub_nr_raid_mirrors(bbio), BTRFS_MAX_MIRRORS);
 
@@ -2127,6 +2127,8 @@ static void scrub_missing_raid56_end_io(struct bio *bio)
         if (bio->bi_error)
                 sblock->no_io_error_seen = 0;
 
+        bio_put(bio);
+
         btrfs_queue_work(fs_info->scrub_workers, &sblock->work);
 }
 
@@ -2860,7 +2862,7 @@ static noinline_for_stack int scrub_raid56_parity(struct scrub_ctx *sctx,
         int extent_mirror_num;
         int stop_loop = 0;
 
-        nsectors = map->stripe_len / root->sectorsize;
+        nsectors = div_u64(map->stripe_len, root->sectorsize);
         bitmap_len = scrub_calc_parity_bitmap_len(nsectors);
         sparity = kzalloc(sizeof(struct scrub_parity) + 2 * bitmap_len,
                           GFP_NOFS);
@@ -3070,7 +3072,6 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         int slot;
         u64 nstripes;
         struct extent_buffer *l;
-        struct btrfs_key key;
         u64 physical;
         u64 logical;
         u64 logic_end;
@@ -3079,7 +3080,7 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         int mirror_num;
         struct reada_control *reada1;
         struct reada_control *reada2;
-        struct btrfs_key key_start;
+        struct btrfs_key key;
         struct btrfs_key key_end;
         u64 increment = map->stripe_len;
         u64 offset;
@@ -3158,21 +3159,21 @@ static noinline_for_stack int scrub_stripe(struct scrub_ctx *sctx,
         scrub_blocked_if_needed(fs_info);
 
         /* FIXME it might be better to start readahead at commit root */
-        key_start.objectid = logical;
-        key_start.type = BTRFS_EXTENT_ITEM_KEY;
-        key_start.offset = (u64)0;
+        key.objectid = logical;
+        key.type = BTRFS_EXTENT_ITEM_KEY;
+        key.offset = (u64)0;
         key_end.objectid = logic_end;
         key_end.type = BTRFS_METADATA_ITEM_KEY;
         key_end.offset = (u64)-1;
-        reada1 = btrfs_reada_add(root, &key_start, &key_end);
+        reada1 = btrfs_reada_add(root, &key, &key_end);
 
-        key_start.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
-        key_start.type = BTRFS_EXTENT_CSUM_KEY;
-        key_start.offset = logical;
+        key.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
+        key.type = BTRFS_EXTENT_CSUM_KEY;
+        key.offset = logical;
         key_end.objectid = BTRFS_EXTENT_CSUM_OBJECTID;
         key_end.type = BTRFS_EXTENT_CSUM_KEY;
         key_end.offset = logic_end;
-        reada2 = btrfs_reada_add(csum_root, &key_start, &key_end);
+        reada2 = btrfs_reada_add(csum_root, &key, &key_end);
 
         if (!IS_ERR(reada1))
                 btrfs_reada_wait(reada1);