mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-11 00:08:50 +00:00
dm snapshot: delay merging a chunk until writes to it complete
Track writes to chunks that are currently being merged and delay merging a chunk until all writes to that chunk finish. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Reviewed-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
parent
9fe8625488
commit
17aa03326d
@ -892,7 +892,7 @@ static void snapshot_merge_next_chunks(struct dm_snapshot *s)
|
||||
s->num_merging_chunks = 1;
|
||||
up_write(&s->lock);
|
||||
|
||||
/* !!! FIXME: wait until writes to this chunk drain */
|
||||
__check_for_conflicting_io(s, old_chunk);
|
||||
|
||||
dm_kcopyd_copy(s->kcopyd_client, &src, 1, &dest, 0, merge_callback, s);
|
||||
return;
|
||||
@ -1635,7 +1635,11 @@ static int snapshot_merge_map(struct dm_target *ti, struct bio *bio,
|
||||
r = DM_MAPIO_SUBMITTED;
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
remap_exception(s, e, bio, chunk);
|
||||
|
||||
if (bio_rw(bio) == WRITE)
|
||||
map_context->ptr = track_chunk(s, chunk);
|
||||
goto out_unlock;
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user