diff options
| -rw-r--r-- | btrfs-convert.c | 13 | ||||
| -rw-r--r-- | volumes.c | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/btrfs-convert.c b/btrfs-convert.c index 6e2ab0f2..4c6c793a 100644 --- a/btrfs-convert.c +++ b/btrfs-convert.c @@ -2418,8 +2418,17 @@ static int may_rollback(struct btrfs_root *root) while (1) { ret = btrfs_map_block(&info->mapping_tree, WRITE, bytenr, &length, &multi, 0, NULL); - if (ret) + if (ret) { + if (ret == -ENOENT) { + /* removed block group at the tail */ + if (length == (u64)-1) + break; + + /* removed block group in the middle */ + goto next; + } goto fail; + } num_stripes = multi->num_stripes; physical = multi->stripes[0].physical; @@ -2427,7 +2436,7 @@ static int may_rollback(struct btrfs_root *root) if (num_stripes != 1 || physical != bytenr) goto fail; - +next: bytenr += length; if (bytenr >= total_bytes) break; @@ -1318,10 +1318,12 @@ again: ce = search_cache_extent(&map_tree->cache_tree, logical); if (!ce) { kfree(multi); + *length = (u64)-1; return -ENOENT; } if (ce->start > logical) { kfree(multi); + *length = ce->start - logical; return -ENOENT; } |