dm snapshot: create function for chunk_is_tracked wait (615d1eb9) · Commits · 戴 / test

Move the __chunk_is_tracked() loop into a separate function as we will also need to call it from the write path in the rare case of conflicting writes to the same chunk. Originally introduced in commit ("dm snapshot: fix race during exception creation"). Signed-off-by:

Mike Snitzer <snitzer@redhat.com> Signed-off-by:

Alasdair G Kergon <agk@redhat.com>

drivers/md/dm-snap.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -233,6 +233,16 @@ static int __chunk_is_tracked(struct dm_snapshot *s, chunk_t chunk)
		return found;
		}

		/*
		* This conflicting I/O is extremely improbable in the caller,
		* so msleep(1) is sufficient and there is no need for a wait queue.
		*/
		static void __check_for_conflicting_io(struct dm_snapshot *s, chunk_t chunk)
		{
		while (__chunk_is_tracked(s, chunk))
		msleep(1);
		}

		/*
		* One of these per registered origin, held in the snapshot_origins hash
		*/
		@@ -1102,12 +1112,8 @@ static void pending_complete(struct dm_snap_pending_exception *pe, int success)
		goto out;
		}

		/*
		* Check for conflicting reads. This is extremely improbable,
		* so msleep(1) is sufficient and there is no need for a wait queue.
		*/
		while (__chunk_is_tracked(s, pe->e.old_chunk))
		msleep(1);
		/* Check for conflicting reads */
		__check_for_conflicting_io(s, pe->e.old_chunk);

		/*
		* Add a proper exception, and remove the

Admin message