]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
imsm: cleanup print_imsm_dev()
authorDan Williams <dan.j.williams@intel.com>
Sat, 12 Dec 2009 20:57:28 +0000 (13:57 -0700)
committerDan Williams <dan.j.williams@intel.com>
Sat, 12 Dec 2009 20:57:28 +0000 (13:57 -0700)
When printing the migration state there is no need to print "migrating".
The fact that the state is non-idle should be enough indication.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
super-intel.c

index 2d5796fedd5196f08a4e09a806fcc457a5f81908..ab8172d0a9bfb3a2d9acdd1817d50fd9b42b571b 100644 (file)
@@ -669,23 +669,24 @@ static void print_imsm_dev(struct imsm_dev *dev, char *uuid, int disk_idx)
        printf("     Chunk Size : %u KiB\n",
                __le16_to_cpu(map->blocks_per_strip) / 2);
        printf("       Reserved : %d\n", __le32_to_cpu(dev->reserved_blocks));
-       printf("  Migrate State : %s", dev->vol.migr_state ? "migrating" : "idle\n");
+       printf("  Migrate State : ");
        if (dev->vol.migr_state) {
                if (migr_type(dev) == MIGR_INIT)
-                       printf(": initializing\n");
+                       printf("initialize\n");
                else if (migr_type(dev) == MIGR_REBUILD)
-                       printf(": rebuilding\n");
+                       printf("rebuild\n");
                else if (migr_type(dev) == MIGR_VERIFY)
-                       printf("check\n");
+                       printf("check\n");
                else if (migr_type(dev) == MIGR_GEN_MIGR)
-                       printf("general migration\n");
+                       printf("general migration\n");
                else if (migr_type(dev) == MIGR_STATE_CHANGE)
-                       printf("state change\n");
+                       printf("state change\n");
                else if (migr_type(dev) == MIGR_REPAIR)
-                       printf("repair\n");
+                       printf("repair\n");
                else
-                       printf(": <unknown:%d>\n", migr_type(dev));
-       }
+                       printf("<unknown:%d>\n", migr_type(dev));
+       } else
+               printf("idle\n");
        printf("      Map State : %s", map_state_str[map->map_state]);
        if (dev->vol.migr_state) {
                struct imsm_map *map = get_imsm_map(dev, 1);