]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
btrfs: Fix BUG_ON condition in scrub_setup_recheck_block()
authorAshish Samant <ashish.samant@oracle.com>
Sat, 30 Apr 2016 01:09:15 +0000 (18:09 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 22 May 2016 21:42:22 +0000 (14:42 -0700)
pagev array in scrub_block{} is of size SCRUB_MAX_PAGES_PER_BLOCK.
page_index should be checked with the same to trigger BUG_ON().

Orabug : 22351960

Signed-off-by: Ashish Samant <ashish.samant@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
fs/btrfs/scrub.c

index ab5811545a988edf685ef4acce607cbff1ac7b81..30aea281d58316abbafff89ba45265cc18c31bcb 100644 (file)
@@ -1364,7 +1364,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);