From c02817f4de0ab57ce42fa8d11fc78e5a654e02da Mon Sep 17 00:00:00 2001 From: Tomohiro Kusumi Date: Thu, 12 Aug 2010 04:13:59 +0100 Subject: [PATCH] --- yaml --- r: 209154 b: refs/heads/master c: 87c961cb747fa55b664b76abfcb9d44c14ae851f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-snap-persistent.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 00ccbd850b6d..08923c2c20cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9c88f2ebc1a5937915cb3b89c9f03894134f39a +refs/heads/master: 87c961cb747fa55b664b76abfcb9d44c14ae851f diff --git a/trunk/drivers/md/dm-snap-persistent.c b/trunk/drivers/md/dm-snap-persistent.c index c097d8a4823d..cc2bdb83f9ad 100644 --- a/trunk/drivers/md/dm-snap-persistent.c +++ b/trunk/drivers/md/dm-snap-persistent.c @@ -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; }