Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/md/dm-snap.c

+4 −5
Original line number Diff line number Diff line
@@ -1699,11 +1699,9 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio, 


	down_write(&s->lock);



	/* Full snapshots are not usable */

	if (!s->valid) {

		r = -EIO;

		goto out_unlock;

	}

	/* Full merging snapshots are redirected to the origin */

	if (!s->valid)

		goto redirect_to_origin;



	/* If the block is already remapped - use that */

	e = dm_lookup_exception(&s->complete, chunk);
@@ -1726,6 +1724,7 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio, 
		goto out_unlock;

	}



redirect_to_origin:

	bio->bi_bdev = s->origin->bdev;



	if (bio_rw(bio) == WRITE) {