Commit 7acedc5b authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Alasdair G Kergon

dm exception store: fix misordered writes

We must zero the next chunk on disk *before* writing out the current chunk, not
after.  Otherwise if the machine crashes at the wrong time, the "end of metadata"
marker may be missing.
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
Cc: stable@kernel.org
parent 7c9e6c17
...@@ -610,18 +610,23 @@ static void persistent_commit(struct exception_store *store, ...@@ -610,18 +610,23 @@ static void persistent_commit(struct exception_store *store,
(ps->current_committed != ps->exceptions_per_area)) (ps->current_committed != ps->exceptions_per_area))
return; return;
/*
* If we completely filled the current area, then wipe the next one.
*/
if ((ps->current_committed == ps->exceptions_per_area) &&
zero_disk_area(ps, ps->current_area + 1))
ps->valid = 0;
/* /*
* Commit exceptions to disk. * Commit exceptions to disk.
*/ */
if (area_io(ps, WRITE)) if (ps->valid && area_io(ps, WRITE))
ps->valid = 0; ps->valid = 0;
/* /*
* Advance to the next area if this one is full. * Advance to the next area if this one is full.
*/ */
if (ps->current_committed == ps->exceptions_per_area) { if (ps->current_committed == ps->exceptions_per_area) {
if (zero_disk_area(ps, ps->current_area + 1))
ps->valid = 0;
ps->current_committed = 0; ps->current_committed = 0;
ps->current_area++; ps->current_area++;
zero_memory_area(ps); zero_memory_area(ps);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment