diff options
| author | Omar Sandoval <osandov@fb.com> | 2015-06-19 20:52:48 +0200 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-08-09 16:34:26 +0200 |
| commit | 03679ade86b2b1c370c8790f1ffcbcdef6d49f9f (patch) | |
| tree | 880ee59349f2a9fa6b906f3ba70993ba5fbd3e1d /fs/btrfs/scrub.c | |
| parent | btrfs: fix clone / extent-same deadlocks (diff) | |
| download | linux-03679ade86b2b1c370c8790f1ffcbcdef6d49f9f.tar.xz linux-03679ade86b2b1c370c8790f1ffcbcdef6d49f9f.zip | |
Btrfs: remove misleading handling of missing device scrub
scrub_submit() claims that it can handle a bio with a NULL block device,
but this is misleading, as calling bio_add_page() on a bio with a NULL
->bi_bdev would've already crashed. Delete this, as we're about to
properly handle a missing block device.
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs/scrub.c')
| -rw-r--r-- | fs/btrfs/scrub.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 7555ddc5289f..a12c450e55fa 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -2096,21 +2096,7 @@ static void scrub_submit(struct scrub_ctx *sctx) sbio = sctx->bios[sctx->curr]; sctx->curr = -1; scrub_pending_bio_inc(sctx); - - if (!sbio->bio->bi_bdev) { - /* - * this case should not happen. If btrfs_map_block() is - * wrong, it could happen for dev-replace operations on - * missing devices when no mirrors are available, but in - * this case it should already fail the mount. - * This case is handled correctly (but _very_ slowly). - */ - printk_ratelimited(KERN_WARNING - "BTRFS: scrub_submit(bio bdev == NULL) is unexpected!\n"); - bio_endio(sbio->bio, -EIO); - } else { - btrfsic_submit_bio(READ, sbio->bio); - } + btrfsic_submit_bio(READ, sbio->bio); } static int scrub_add_page_to_rd_bio(struct scrub_ctx *sctx, |