[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, 12 insertions, 5 deletions

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 3b3f4c9c3f09..23a642619bed 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -344,6 +344,17 @@ static void dispatch_bios(struct mirror_set *ms, struct bio_list *bio_list)
         }
 }
 
+static void complete_resync_work(struct region *reg, int success)
+{
+        struct region_hash *rh = reg->rh;
+
+        rh->log->type->set_region_sync(rh->log, reg->key, success);
+        dispatch_bios(rh->ms, &reg->delayed_bios);
+        if (atomic_dec_and_test(&rh->recovery_in_flight))
+                wake_up_all(&_kmirrord_recovery_stopped);
+        up(&rh->recovery_count);
+}
+
 static void rh_update_states(struct region_hash *rh)
 {
         struct region *reg, *next;
@@ -383,11 +394,7 @@ static void rh_update_states(struct region_hash *rh)
          */
         list_for_each_entry_safe (reg, next, &recovered, list) {
                 rh->log->type->clear_region(rh->log, reg->key);
-                rh->log->type->complete_resync_work(rh->log, reg->key, 1);
-                dispatch_bios(rh->ms, &reg->delayed_bios);
-                if (atomic_dec_and_test(&rh->recovery_in_flight))
-                        wake_up_all(&_kmirrord_recovery_stopped);
-                up(&rh->recovery_count);
+                complete_resync_work(reg, 1);
                 mempool_free(reg, rh->region_pool);
         }