[PATCH] dm: log: rename complete_resync_work

The complete_resync_work function only provides the ability to change an
out-of-sync region to in-sync.  This patch enhances the function to allow us
to change the status from in-sync to out-of-sync as well, something that is
needed when a mirror write to one of the devices or an initial resync on a
given region fails.

Signed-off-by: Jonathan E Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
Cc: dm-devel@redhat.com
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 64b764bd02cc..ce5c5d6fc107 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -549,16 +549,19 @@ static int core_get_resync_work(struct dirty_log *log, region_t *region)
         return 1;
 }
 
-static void core_complete_resync_work(struct dirty_log *log, region_t region,
-                                      int success)
+static void core_set_region_sync(struct dirty_log *log, region_t region,
+                                 int in_sync)
 {
         struct log_c *lc = (struct log_c *) log->context;
 
         log_clear_bit(lc, lc->recovering_bits, region);
-        if (success) {
+        if (in_sync) {
                 log_set_bit(lc, lc->sync_bits, region);
                 lc->sync_count++;
-        }
+        } else if (log_test_bit(lc->sync_bits, region)) {
+                lc->sync_count--;
+                log_clear_bit(lc, lc->sync_bits, region);
+        }
 }
 
 static region_t core_get_sync_count(struct dirty_log *log)
@@ -625,7 +628,7 @@ static struct dirty_log_type _core_type = {
         .mark_region = core_mark_region,
         .clear_region = core_clear_region,
         .get_resync_work = core_get_resync_work,
-        .complete_resync_work = core_complete_resync_work,
+        .set_region_sync = core_set_region_sync,
         .get_sync_count = core_get_sync_count,
         .status = core_status,
 };
@@ -644,7 +647,7 @@ static struct dirty_log_type _disk_type = {
         .mark_region = core_mark_region,
         .clear_region = core_clear_region,
         .get_resync_work = core_get_resync_work,
-        .complete_resync_work = core_complete_resync_work,
+        .set_region_sync = core_set_region_sync,
         .get_sync_count = core_get_sync_count,
         .status = disk_status,
 };