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

Commit 87c961cb authored by Tomohiro Kusumi's avatar Tomohiro Kusumi Committed by Alasdair G Kergon
Browse files

dm snapshot: persistent use define for disk header chunk size 



This patch fixes hard-coded value for the size of a chunk that includes
disk header for persistent snapshot. It should be changed to existing
macro NUM_SNAPSHOT_HDR_CHUNKS instead of using hard-coded value 1.

Signed-off-by: default avatarTomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent a9c88f2e

drivers/md/dm-snap-persistent.c

+3 −3
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int chunk_io(struct pstore *ps, void *area, chunk_t chunk, int rw, 
 */

static chunk_t area_location(struct pstore *ps, chunk_t area)

{

	return 1 + ((ps->exceptions_per_area + 1) * area);

	return NUM_SNAPSHOT_HDR_CHUNKS + ((ps->exceptions_per_area + 1) * area);

}



/*
@@ -780,8 +780,8 @@ static int persistent_commit_merge(struct dm_exception_store *store, 
	 * ps->current_area does not get reduced by prepare_merge() until

	 * after commit_merge() has removed the nr_merged previous exceptions.

	 */

	ps->next_free = (area_location(ps, ps->current_area) - 1) +

			(ps->current_committed + 1) + NUM_SNAPSHOT_HDR_CHUNKS;

	ps->next_free = area_location(ps, ps->current_area) +

			ps->current_committed + 1;



	return 0;

}