From 0524009ac05c72fbd5bfdd562cd999f2efc8d3d3 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 3 Oct 2006 01:15:27 -0700 Subject: [PATCH] --- yaml --- r: 38090 b: refs/heads/master c: 927ffe7c9a156e259aae31c07dd76072c459ec57 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/dm-exception-store.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 295488842101..4b85c92e88ad 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4ff496db72473949ddfe29a37471969d2f1d4ee +refs/heads/master: 927ffe7c9a156e259aae31c07dd76072c459ec57 diff --git a/trunk/drivers/md/dm-exception-store.c b/trunk/drivers/md/dm-exception-store.c index 002417da1224..99cdffa7fbfe 100644 --- a/trunk/drivers/md/dm-exception-store.c +++ b/trunk/drivers/md/dm-exception-store.c @@ -536,6 +536,16 @@ static void persistent_commit(struct exception_store *store, if (r) ps->valid = 0; + /* + * Have we completely filled the current area ? + */ + if (ps->current_committed == ps->exceptions_per_area) { + ps->current_committed = 0; + r = zero_area(ps, ps->current_area + 1); + if (r) + ps->valid = 0; + } + for (i = 0; i < ps->callback_count; i++) { cb = ps->callbacks + i; cb->callback(cb->context, r == 0 ? 1 : 0); @@ -543,16 +553,6 @@ static void persistent_commit(struct exception_store *store, ps->callback_count = 0; } - - /* - * Have we completely filled the current area ? - */ - if (ps->current_committed == ps->exceptions_per_area) { - ps->current_committed = 0; - r = zero_area(ps, ps->current_area + 1); - if (r) - ps->valid = 0; - } } static void persistent_drop(struct exception_store *store)