Device Mapper Mirror
PATCH 1/1 Device Mapper Mirror
brassow
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 fails to one of the devices or an initial resync fails on a given region.
The function name has been changed to more accurately reflect its intended use.
drivers/md/dm-log.c +9 -6
@@ -549,16 +549,19 @@ static int core_get_resync_work(struct dreturn 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, };
drivers/md/dm-log.h +5 -5
@@ -90,12 +90,12 @@ struct dirty_log_type {int (*get_resync_work)(struct dirty_log *log,region_t *region);/* -* This notifies the log that the resync of an area has -* been completed. The log should then mark this region -* as CLEAN. +* This notifies the log that the resync status of a region +* has changed. It also clears the region from the recovering +* list (if present). */ -void (*complete_resync_work)(struct dirty_log *log, -region_t region,int success); +void (*set_region_sync)(struct dirty_log *log, +region_t region,int in_sync);/* * Returns the number of regions that are in sync.
drivers/md/dm-raid1.c +10 -3
@@ -341,6 +341,15 @@ static void dispatch_bios(struct mirror_ } } +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, ®->delayed_bios); +up (&rh->recovery_count); +} +static void rh_update_states (struct region_hash *rh) {struct region *reg, *next;
@@ -380,9 +389,7 @@ static void rh_update_states(struct regi*/ 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, ®->delayed_bios); -up (&rh->recovery_count); +complete_resync_work (reg,1 );mempool_free (reg, rh->region_pool); }