diff options
author | Omar Sandoval <osandov@fb.com> | 2015-06-19 20:52:50 +0200 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2015-08-09 16:34:26 +0200 |
commit | b4ee1782686d5b7a97826d67fdeaefaedbca23ce (patch) | |
tree | 74da39569b9efe1f48cb1c14bd72617f54128cef /fs/btrfs/scrub.c | |
parent | Btrfs: count devices correctly in readahead during RAID 5/6 replace (diff) | |
download | linux-b4ee1782686d5b7a97826d67fdeaefaedbca23ce.tar.xz linux-b4ee1782686d5b7a97826d67fdeaefaedbca23ce.zip |
Btrfs: add RAID 5/6 BTRFS_RBIO_REBUILD_MISSING operation
The current RAID 5/6 recovery code isn't quite prepared to handle
missing devices. In particular, it expects a bio that we previously
attempted to use in the read path, meaning that it has valid pages
allocated. However, missing devices have a NULL blkdev, and we can't
call bio_add_page() on a bio with a NULL blkdev. We could do manual
manipulation of bio->bi_io_vec, but that's pretty gross. So instead, add
a separate path that allows us to manually add pages to the rbio.
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 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index a12c450e55fa..038162456cfa 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c @@ -2720,8 +2720,7 @@ static void scrub_parity_check_and_repair(struct scrub_parity *sparity) goto rbio_out; list_for_each_entry(spage, &sparity->spages, list) - raid56_parity_add_scrub_pages(rbio, spage->page, - spage->logical); + raid56_add_scrub_pages(rbio, spage->page, spage->logical); scrub_pending_bio_inc(sctx); raid56_parity_submit_scrub_rbio(rbio); |