Commit d2fdb776 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Alasdair G Kergon

dm snapshot: use merge origin if snapshot invalid

If the snapshot we are merging became invalid (e.g. it ran out of
space) redirect all I/O directly to the origin device.
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Reviewed-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent d8ddb1cf
...@@ -1699,11 +1699,9 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio, ...@@ -1699,11 +1699,9 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio,
down_write(&s->lock); down_write(&s->lock);
/* Full snapshots are not usable */ /* Full merging snapshots are redirected to the origin */
if (!s->valid) { if (!s->valid)
r = -EIO; goto redirect_to_origin;
goto out_unlock;
}
/* If the block is already remapped - use that */ /* If the block is already remapped - use that */
e = dm_lookup_exception(&s->complete, chunk); e = dm_lookup_exception(&s->complete, chunk);
...@@ -1726,6 +1724,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio, ...@@ -1726,6 +1724,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio,
goto out_unlock; goto out_unlock;
} }
redirect_to_origin:
bio->bi_bdev = s->origin->bdev; bio->bi_bdev = s->origin->bdev;
if (bio_rw(bio) == WRITE) { if (bio_rw(bio) == WRITE) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment