Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 87c961cb747fa55b664b76abfcb9d44c14ae851f

Authored by Tomohiro Kusumi
Committed by Alasdair G Kergon
1 parent a9c88f2ebc
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Tomohiro Kusumi <kusumi.tomohiro@jp.fujitsu.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

drivers/md/dm-snap-persistent.c
Diff comments   View file @ 87c961c
... ... @@ -266,7 +266,7 @@
266 266 */
267 267 static chunk_t area_location(struct pstore *ps, chunk_t area)
268 268 {
269   - return 1 + ((ps->exceptions_per_area + 1) * area);
  269 + return NUM_SNAPSHOT_HDR_CHUNKS + ((ps->exceptions_per_area + 1) * area);
270 270 }
271 271  
272 272 /*
... ... @@ -780,8 +780,8 @@
780 780 * ps->current_area does not get reduced by prepare_merge() until
781 781 * after commit_merge() has removed the nr_merged previous exceptions.
782 782 */
783   - ps->next_free = (area_location(ps, ps->current_area) - 1) +
784   - (ps->current_committed + 1) + NUM_SNAPSHOT_HDR_CHUNKS;
  783 + ps->next_free = area_location(ps, ps->current_area) +
  784 + ps->current_committed + 1;
785 785  
786 786 return 0;
787 787 }