]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Btrfs: avoid I/O repair BUG() from btree_read_extent_buffer_pages()
authorStefan Behrens <sbehrens@giantdisaster.de>
Tue, 10 Jul 2012 13:30:17 +0000 (07:30 -0600)
committerChris Mason <chris.mason@fusionio.com>
Mon, 23 Jul 2012 20:27:59 +0000 (16:27 -0400)
From btree_read_extent_buffer_pages(), currently repair_io_failure()
can be called with mirror_num being zero when submit_one_bio() returned
an error before. This used to cause a BUG_ON(!mirror_num) in
repair_io_failure() and indeed this is not a case that needs the I/O
repair code to rewrite disk blocks.
This commit prevents calling repair_io_failure() in this case and thus
avoids the BUG_ON() and malfunction.

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
fs/btrfs/disk-io.c

index dd6676b446f654cb6ce6140a68c5c265432cd4d9..1a4a2a97592670b2d6f747afb240f9ee6722b19a 100644 (file)
@@ -407,7 +407,7 @@ static int btree_read_extent_buffer_pages(struct btrfs_root *root,
                        break;
        }
 
-       if (failed && !ret)
+       if (failed && !ret && failed_mirror)
                repair_eb_io_failure(root, eb, failed_mirror);
 
        return ret;