1 files changed, 21 insertions, 8 deletions

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 4e90f231fbfb..d12cf3e5e076 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -402,9 +402,21 @@ static void rh_dec(struct region_hash *rh, region_t region)
 
         spin_lock_irqsave(&rh->region_lock, flags);
         if (atomic_dec_and_test(&reg->pending)) {
+                /*
+                 * There is no pending I/O for this region.
+                 * We can move the region to corresponding list for next action.
+                 * At this point, the region is not yet connected to any list.
+                 *
+                 * If the state is RH_NOSYNC, the region should be kept off
+                 * from clean list.
+                 * The hash entry for RH_NOSYNC will remain in memory
+                 * until the region is recovered or the map is reloaded.
+                 */
+
+                /* do nothing for RH_NOSYNC */
                 if (reg->state == RH_RECOVERING) {
                         list_add_tail(&reg->list, &rh->quiesced_regions);
-                } else {
+                } else if (reg->state == RH_DIRTY) {
                         reg->state = RH_CLEAN;
                         list_add(&reg->list, &rh->clean_regions);
                 }
@@ -922,9 +934,9 @@ static inline int _check_region_size(struct dm_target *ti, uint32_t size)
 static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                       unsigned int mirror, char **argv)
 {
-        sector_t offset;
+        unsigned long long offset;
 
-        if (sscanf(argv[1], SECTOR_FORMAT, &offset) != 1) {
+        if (sscanf(argv[1], "%llu", &offset) != 1) {
                 ti->error = "dm-mirror: Invalid offset";
                 return -EINVAL;
         }
@@ -1191,16 +1203,17 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
                 for (m = 0; m < ms->nr_mirrors; m++)
                         DMEMIT("%s ", ms->mirror[m].dev->name);
 
-                DMEMIT(SECTOR_FORMAT "/" SECTOR_FORMAT,
-                       ms->rh.log->type->get_sync_count(ms->rh.log),
-                       ms->nr_regions);
+                DMEMIT("%llu/%llu",
+                        (unsigned long long)ms->rh.log->type->
+                                get_sync_count(ms->rh.log),
+                        (unsigned long long)ms->nr_regions);
                 break;
 
         case STATUSTYPE_TABLE:
                 DMEMIT("%d ", ms->nr_mirrors);
                 for (m = 0; m < ms->nr_mirrors; m++)
-                        DMEMIT("%s " SECTOR_FORMAT " ",
-                               ms->mirror[m].dev->name, ms->mirror[m].offset);
+                        DMEMIT("%s %llu ", ms->mirror[m].dev->name,
+                                (unsigned long long)ms->mirror[m].offset);
         }
 
         return 0;