]> git.ipfire.org Git - thirdparty/mdadm.git/blobdiff - super-intel.c
Don't break long strings onto multiple lines.
[thirdparty/mdadm.git] / super-intel.c
index 4b23b9ab7dde091b69ca9ec985a13acd13e28c85..819e0da1019e9e5dc834a4155744c35f2368e0d3 100644 (file)
@@ -1386,7 +1386,7 @@ static int imsm_check_attributes(__u32 attributes)
                }
 
                if (not_supported)
-                       dprintf(Name "(IMSM): Unknown attributes : %x\n", not_supported);
+                       dprintf("(IMSM): Unknown attributes : %x\n", not_supported);
 
                ret_val = 0;
        }
@@ -1926,8 +1926,7 @@ static int detail_platform_imsm(int verbose, int enumerate_only, char *controlle
        list = find_intel_devices();
        if (!list) {
                if (verbose > 0)
-                       pr_err("no active Intel(R) RAID "
-                               "controller found.\n");
+                       pr_err("no active Intel(R) RAID controller found.\n");
                return 2;
        } else if (verbose > 0)
                print_found_intel_controllers(list);
@@ -1975,8 +1974,7 @@ static int detail_platform_imsm(int verbose, int enumerate_only, char *controlle
                                host_base = ahci_get_port_count(hba->path, &port_count);
                                if (ahci_enumerate_ports(hba->path, port_count, host_base, verbose)) {
                                        if (verbose > 0)
-                                               pr_err("failed to enumerate "
-                                                       "ports on SATA controller at %s.\n", hba->pci_id);
+                                               pr_err("failed to enumerate ports on SATA controller at %s.\n", hba->pci_id);
                                        result |= 2;
                                }
                        }
@@ -2192,7 +2190,7 @@ static __u8 imsm_num_data_members(struct imsm_dev *dev, int second_map)
        case 5:
                return map->num_members - 1;
        default:
-               dprintf("%s: unsupported raid level\n", __func__);
+               dprintf("unsupported raid level\n");
                return 0;
        }
 }
@@ -2449,7 +2447,7 @@ static int imsm_create_metadata_checkpoint_update(
 
        int update_memory_size = 0;
 
-       dprintf("imsm_create_metadata_checkpoint_update(enter)\n");
+       dprintf("(enter)\n");
 
        if (u == NULL)
                return 0;
@@ -2461,14 +2459,12 @@ static int imsm_create_metadata_checkpoint_update(
 
        *u = xcalloc(1, update_memory_size);
        if (*u == NULL) {
-               dprintf("error: cannot get memory for "
-                       "imsm_create_metadata_checkpoint_update update\n");
+               dprintf("error: cannot get memory\n");
                return 0;
        }
        (*u)->type = update_general_migration_checkpoint;
        (*u)->curr_migr_unit = __le32_to_cpu(super->migr_rec->curr_migr_unit);
-       dprintf("imsm_create_metadata_checkpoint_update: prepared for %u\n",
-               (*u)->curr_migr_unit);
+       dprintf("prepared for %u\n", (*u)->curr_migr_unit);
 
        return update_memory_size;
 }
@@ -2603,9 +2599,7 @@ static unsigned long long imsm_component_size_aligment_check(int level,
        */
        component_size_alligment = component_size % (chunk_size/512);
 
-       dprintf("imsm_component_size_aligment_check(Level: %i, "
-               "chunk_size = %i, component_size = %llu), "
-               "component_size_alligment = %u\n",
+       dprintf("(Level: %i, chunk_size = %i, component_size = %llu), component_size_alligment = %u\n",
                level, chunk_size, component_size,
                component_size_alligment);
 
@@ -2613,7 +2607,7 @@ static unsigned long long imsm_component_size_aligment_check(int level,
                dprintf("imsm: reported component size alligned from %llu ",
                        component_size);
                component_size -= component_size_alligment;
-               dprintf("to %llu (%i).\n",
+               dprintf_cont("to %llu (%i).\n",
                        component_size, component_size_alligment);
        }
 
@@ -2753,8 +2747,7 @@ static void getinfo_super_imsm_volume(struct supertype *st, struct mdinfo *info,
 
                        info->reshape_progress = blocks_per_unit * units;
 
-                       dprintf("IMSM: General Migration checkpoint : %llu "
-                              "(%llu) -> read reshape progress : %llu\n",
+                       dprintf("IMSM: General Migration checkpoint : %llu (%llu) -> read reshape progress : %llu\n",
                                (unsigned long long)units,
                                (unsigned long long)blocks_per_unit,
                                info->reshape_progress);
@@ -2933,7 +2926,7 @@ static void getinfo_super_imsm(struct supertype *st, struct mdinfo *info, char *
                 */
                max_enough = max(max_enough, enough);
        }
-       dprintf("%s: enough: %d\n", __func__, max_enough);
+       dprintf("enough: %d\n", max_enough);
        info->container_enough = max_enough;
 
        if (super->disks) {
@@ -3623,8 +3616,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
 
        if (posix_memalign((void**)&anchor, 512, 512) != 0) {
                if (devname)
-                       pr_err("Failed to allocate imsm anchor buffer"
-                              " on %s\n", devname);
+                       pr_err("Failed to allocate imsm anchor buffer on %s\n", devname);
                return 1;
        }
        if (read(fd, anchor, 512) != 512) {
@@ -3661,7 +3653,7 @@ static int load_imsm_mpb(int fd, struct intel_super *super, char *devname)
        free(anchor);
 
        if (posix_memalign(&super->migr_rec_buf, 512, MIGR_REC_BUF_SIZE) != 0) {
-               pr_err("%s could not allocate migr_rec buffer\n", __func__);
+               pr_err("could not allocate migr_rec buffer\n");
                free(super->buf);
                return 2;
        }
@@ -3872,10 +3864,8 @@ static int find_intel_hba_capability(int fd, struct intel_super *super, char *de
                if (devname) {
                        struct intel_hba *hba = super->hba;
 
-                       pr_err("%s is attached to Intel(R) %s RAID "
-                               "controller (%s),\n"
-                               "    but the container is assigned to Intel(R) "
-                               "%s RAID controller (",
+                       pr_err("%s is attached to Intel(R) %s RAID controller (%s),\n"
+                               "    but the container is assigned to Intel(R) %s RAID controller (",
                                devname,
                                get_sys_dev_type(hba_name->type),
                                hba_name->pci_id ? : "Err!",
@@ -3888,8 +3878,7 @@ static int find_intel_hba_capability(int fd, struct intel_super *super, char *de
                                hba = hba->next;
                        }
                        fprintf(stderr, ").\n"
-                               "    Mixing devices attached to different controllers "
-                               "is not allowed.\n");
+                               "    Mixing devices attached to different controllers is not allowed.\n");
                }
                return 2;
        }
@@ -3961,8 +3950,8 @@ static int __prep_thunderdome(struct intel_super **table, int tbl_size,
 
                if (tbl_mpb->family_num == mpb->family_num) {
                        if (tbl_mpb->check_sum == mpb->check_sum) {
-                               dprintf("%s: mpb from %d:%d matches %d:%d\n",
-                                       __func__, super->disks->major,
+                               dprintf("mpb from %d:%d matches %d:%d\n",
+                                       super->disks->major,
                                        super->disks->minor,
                                        table[i]->disks->major,
                                        table[i]->disks->minor);
@@ -3979,8 +3968,8 @@ static int __prep_thunderdome(struct intel_super **table, int tbl_size,
                                 */
                                struct intel_disk *idisk;
 
-                               dprintf("%s: mpb from %d:%d replaces %d:%d\n",
-                                       __func__, super->disks->major,
+                               dprintf("mpb from %d:%d replaces %d:%d\n",
+                                       super->disks->major,
                                        super->disks->minor,
                                        table[i]->disks->major,
                                        table[i]->disks->minor);
@@ -4008,8 +3997,8 @@ static int __prep_thunderdome(struct intel_super **table, int tbl_size,
                                                idisk->disk.status |= CONFIGURED_DISK;
                                }
 
-                               dprintf("%s: mpb from %d:%d prefer %d:%d\n",
-                                       __func__, super->disks->major,
+                               dprintf("mpb from %d:%d prefer %d:%d\n",
+                                       super->disks->major,
                                        super->disks->minor,
                                        table[i]->disks->major,
                                        table[i]->disks->minor);
@@ -4068,12 +4057,12 @@ validate_members(struct intel_super *super, struct intel_disk *disk_list,
                            idisk->owner == IMSM_UNKNOWN_OWNER)
                                ok_count++;
                        else
-                               dprintf("%s: '%.16s' owner %d != %d\n",
-                                       __func__, disk->serial, idisk->owner,
+                               dprintf("'%.16s' owner %d != %d\n",
+                                       disk->serial, idisk->owner,
                                        owner);
                } else {
-                       dprintf("%s: unknown disk %x [%d]: %.16s\n",
-                               __func__, __le32_to_cpu(mpb->family_num), i,
+                       dprintf("unknown disk %x [%d]: %.16s\n",
+                               __le32_to_cpu(mpb->family_num), i,
                                disk->serial);
                        break;
                }
@@ -4129,8 +4118,8 @@ imsm_thunderdome(struct intel_super **super_list, int len)
                        s = NULL;
 
                if (!s)
-                       dprintf("%s: marking family: %#x from %d:%d offline\n",
-                               __func__, mpb->family_num,
+                       dprintf("marking family: %#x from %d:%d offline\n",
+                               mpb->family_num,
                                super_table[i]->disks->major,
                                super_table[i]->disks->minor);
                super_table[i] = s;
@@ -4177,8 +4166,7 @@ imsm_thunderdome(struct intel_super **super_list, int len)
        champion = s;
 
        if (conflict)
-               pr_err("Chose family %#x on '%s', "
-                       "assemble conflicts to new container with '--update=uuid'\n",
+               pr_err("Chose family %#x on '%s', assemble conflicts to new container with '--update=uuid'\n",
                        __le32_to_cpu(s->anchor->family_num), s->disks->devname);
 
        /* collect all dl's onto 'champion', and update them to
@@ -4518,8 +4506,7 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname)
 
        if (rv) {
                if (devname)
-                       pr_err("Failed to load all information "
-                              "sections on %s\n", devname);
+                       pr_err("Failed to load all information sections on %s\n", devname);
                free_imsm(super);
                return rv;
        }
@@ -4655,8 +4642,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        unsigned long long num_data_stripes;
 
        if (super->orom && mpb->num_raid_devs >= super->orom->vpa) {
-               pr_err("This imsm-container already has the "
-                       "maximum of %d volumes\n", super->orom->vpa);
+               pr_err("This imsm-container already has the maximum of %d volumes\n", super->orom->vpa);
                return 0;
        }
 
@@ -4673,8 +4659,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
                }
                if (posix_memalign(&super->migr_rec_buf, 512,
                                   MIGR_REC_BUF_SIZE) != 0) {
-                       pr_err("%s could not allocate migr_rec buffer\n",
-                              __func__);
+                       pr_err("could not allocate migr_rec buffer\n");
                        free(super->buf);
                        free(super);
                        free(mpb_new);
@@ -4758,8 +4743,7 @@ static int init_super_imsm_volume(struct supertype *st, mdu_array_info_t *info,
        if (info->level == 1 && info->raid_disks > 2) {
                free(dev);
                free(dv);
-               pr_err("imsm does not support more than 2 disks"
-                               "in a raid1 volume\n");
+               pr_err("imsm does not support more than 2 disksin a raid1 volume\n");
                return 0;
        }
 
@@ -4832,11 +4816,11 @@ static int init_super_imsm(struct supertype *st, mdu_array_info_t *info,
                super = NULL;
        }
        if (!super) {
-               pr_err("%s could not allocate superblock\n", __func__);
+               pr_err("could not allocate superblock\n");
                return 0;
        }
        if (posix_memalign(&super->migr_rec_buf, 512, MIGR_REC_BUF_SIZE) != 0) {
-               pr_err("%s could not allocate migr_rec buffer\n", __func__);
+               pr_err("could not allocate migr_rec buffer\n");
                free(super->buf);
                free(super);
                return 0;
@@ -5098,8 +5082,7 @@ static int remove_from_super_imsm(struct supertype *st, mdu_disk_info_t *dk)
         * is prepared.
         */
        if (!st->update_tail) {
-               pr_err("%s shall be used in mdmon context only"
-                      "(line %d).\n", __func__, __LINE__);
+               pr_err("shall be used in mdmon context only\n");
                return 1;
        }
        dd = xcalloc(1, sizeof(*dd));
@@ -5158,8 +5141,8 @@ static int write_super_imsm_spares(struct intel_super *super, int doclose)
                spare->check_sum = __cpu_to_le32(sum);
 
                if (store_imsm_mpb(d->fd, spare)) {
-                       pr_err("%s: failed for device %d:%d %s\n",
-                               __func__, d->major, d->minor, strerror(errno));
+                       pr_err("failed for device %d:%d %s\n",
+                               d->major, d->minor, strerror(errno));
                        return 1;
                }
                if (doclose) {
@@ -5252,8 +5235,8 @@ static int write_super_imsm(struct supertype *st, int doclose)
 
                if (store_imsm_mpb(d->fd, mpb))
                        fprintf(stderr,
-                               "%s: failed for device %d:%d (fd: %d)%s\n",
-                               __func__, d->major, d->minor,
+                               "failed for device %d:%d (fd: %d)%s\n",
+                               d->major, d->minor,
                                d->fd, strerror(errno));
 
                if (doclose) {
@@ -5408,7 +5391,7 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
 #if DEBUG
                char str[256];
                fd2devname(fd, str);
-               dprintf("validate_geometry_imsm_container: fd: %d %s orom: %p rv: %d raiddisk: %d\n",
+               dprintf("fd: %d %s orom: %p rv: %d raiddisk: %d\n",
                        fd, str, super->orom, rv, raiddisks);
 #endif
                /* no orom/efi or non-intel hba of the disk */
@@ -5420,8 +5403,7 @@ static int validate_geometry_imsm_container(struct supertype *st, int level,
        if (super->orom) {
                if (raiddisks > super->orom->tds) {
                        if (verbose)
-                               pr_err("%d exceeds maximum number of"
-                                       " platform supported disks: %d\n",
+                               pr_err("%d exceeds maximum number of platform supported disks: %d\n",
                                        raiddisks, super->orom->tds);
                        free_imsm(super);
                        return 0;
@@ -5742,27 +5724,27 @@ count_volumes_list(struct md_list *devlist, char *homehost,
                tmpdev->container = 0;
                dfd = dev_open(devname, O_RDONLY|O_EXCL);
                if (dfd < 0) {
-                       dprintf("cannot open device %s: %s\n",
+                       dprintf("cannot open device %s: %s\n",
                                devname, strerror(errno));
                        tmpdev->used = 2;
                } else if (fstat(dfd, &stb)< 0) {
                        /* Impossible! */
-                       dprintf("fstat failed for %s: %s\n",
+                       dprintf("fstat failed for %s: %s\n",
                                devname, strerror(errno));
                        tmpdev->used = 2;
                } else if ((stb.st_mode & S_IFMT) != S_IFBLK) {
-                       dprintf("%s is not a block device.\n",
+                       dprintf("%s is not a block device.\n",
                                devname);
                        tmpdev->used = 2;
                } else if (must_be_container(dfd)) {
                        struct supertype *cst;
                        cst = super_by_fd(dfd, NULL);
                        if (cst == NULL) {
-                               dprintf("cannot recognize container type %s\n",
+                               dprintf("cannot recognize container type %s\n",
                                        devname);
                                tmpdev->used = 2;
                        } else if (tst->ss != st->ss) {
-                               dprintf("non-imsm container - ignore it: %s\n",
+                               dprintf("non-imsm container - ignore it: %s\n",
                                        devname);
                                tmpdev->used = 2;
                        } else if (!tst->ss->load_container ||
@@ -5776,11 +5758,11 @@ count_volumes_list(struct md_list *devlist, char *homehost,
                } else {
                        tmpdev->st_rdev = stb.st_rdev;
                        if (tst->ss->load_super(tst,dfd, NULL)) {
-                               dprintf("no RAID superblock on %s\n",
+                               dprintf("no RAID superblock on %s\n",
                                        devname);
                                tmpdev->used = 2;
                        } else if (tst->ss->compare_super == NULL) {
-                               dprintf("Cannot assemble %s metadata on %s\n",
+                               dprintf("Cannot assemble %s metadata on %s\n",
                                        tst->ss->name, devname);
                                tmpdev->used = 2;
                        }
@@ -5817,7 +5799,7 @@ count_volumes_list(struct md_list *devlist, char *homehost,
                                 * Or, if we are auto assembling, we just ignore the second
                                 * for now.
                                 */
-                               dprintf("superblock on %s doesn't match others - assembly aborted\n",
+                               dprintf("superblock on %s doesn't match others - assembly aborted\n",
                                        devname);
                                goto loop;
                        }
@@ -5839,7 +5821,7 @@ count_volumes_list(struct md_list *devlist, char *homehost,
                                if (iter->array.state & (1<<MD_SB_BLOCK_VOLUME)) {
                                        /* do not assemble arrays with unsupported
                                           configurations */
-                                       dprintf("Cannot activate member %s.\n",
+                                       dprintf("Cannot activate member %s.\n",
                                                iter->text_version);
                                } else
                                        count++;
@@ -5847,11 +5829,11 @@ count_volumes_list(struct md_list *devlist, char *homehost,
                        sysfs_free(head);
 
                } else {
-                       dprintf(" no valid super block on device list: err: %d %p\n",
+                       dprintf("No valid super block on device list: err: %d %p\n",
                                err, st->sb);
                }
        } else {
-               dprintf(" no more devices to examin\n");
+               dprintf("no more devices to examine\n");
        }
 
        for (tmpdev = devlist; tmpdev; tmpdev = tmpdev->next) {
@@ -5885,7 +5867,7 @@ count_volumes(char *hba, int dpa, int verbose)
                return 0;
 
        count = active_arrays_by_format("imsm", hba, &devlist, dpa, verbose);
-       dprintf(" path: %s active arrays: %d\n", hba, count);
+       dprintf("path: %s active arrays: %d\n", hba, count);
        if (devlist == NULL)
                return 0;
        do  {
@@ -5940,8 +5922,7 @@ validate_geometry_imsm_orom(struct intel_super *super, int level, int layout,
                *chunk = imsm_default_chunk(super->orom);
 
        if (super->orom && !imsm_orom_has_chunk(super->orom, *chunk)) {
-               pr_vrb(": platform does not support a chunk size of: "
-                      "%d\n", *chunk);
+               pr_vrb(": platform does not support a chunk size of: %d\n", *chunk);
                return 0;
        }
 
@@ -5992,8 +5973,7 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
        mpb = super->anchor;
 
        if (!validate_geometry_imsm_orom(super, level, layout, raiddisks, chunk, size, verbose)) {
-               pr_err("RAID gemetry validation failed. "
-                       "Cannot proceed with the action(s).\n");
+               pr_err("RAID gemetry validation failed. Cannot proceed with the action(s).\n");
                return 0;
        }
        if (!dev) {
@@ -6034,9 +6014,7 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
                }
                if (dcnt < raiddisks) {
                        if (verbose)
-                               pr_err("imsm: Not enough "
-                                       "devices with space for this array "
-                                       "(%d < %d)\n",
+                               pr_err("imsm: Not enough devices with space for this array (%d < %d)\n",
                                        dcnt, raiddisks);
                        return 0;
                }
@@ -6055,8 +6033,7 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
        }
        if (!dl) {
                if (verbose)
-                       pr_err("%s is not in the "
-                               "same imsm set\n", dev);
+                       pr_err("%s is not in the same imsm set\n", dev);
                return 0;
        } else if (super->orom && dl->index < 0 && mpb->num_raid_devs) {
                /* If a volume is present then the current creation attempt
@@ -6064,15 +6041,12 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
                 * understand this configuration (all member disks must be
                 * members of each array in the container).
                 */
-               pr_err("%s is a spare and a volume"
-                       " is already defined for this container\n", dev);
-               pr_err("The option-rom requires all member"
-                       " disks to be a member of all volumes\n");
+               pr_err("%s is a spare and a volume is already defined for this container\n", dev);
+               pr_err("The option-rom requires all member disks to be a member of all volumes\n");
                return 0;
        } else if (super->orom && mpb->num_raid_devs > 0 &&
                   mpb->num_disks != raiddisks) {
-               pr_err("The option-rom requires all member"
-                       " disks to be a member of all volumes\n");
+               pr_err("The option-rom requires all member disks to be a member of all volumes\n");
                return 0;
        }
 
@@ -6115,21 +6089,16 @@ static int validate_geometry_imsm_volume(struct supertype *st, int level,
 
        if (!check_env("IMSM_NO_PLATFORM") &&
            mpb->num_raid_devs > 0 && size && size != maxsize) {
-               pr_err("attempting to create a second "
-                       "volume with size less then remaining space. "
-                       "Aborting...\n");
+               pr_err("attempting to create a second volume with size less then remaining space. Aborting...\n");
                return 0;
        }
 
        if (maxsize < size || maxsize == 0) {
                if (verbose) {
                        if (maxsize == 0)
-                               pr_err("no free space"
-                                               " left on device. Aborting...\n");
+                               pr_err("no free space left on device. Aborting...\n");
                        else
-                               pr_err("not enough space"
-                                               " to create volume of given size"
-                                               " (%llu < %llu). Aborting...\n",
+                               pr_err("not enough space to create volume of given size (%llu < %llu). Aborting...\n",
                                                maxsize, size);
                }
                return 0;
@@ -6215,9 +6184,7 @@ static int imsm_get_free_size(struct supertype *st, int raiddisks,
        }
        if (!check_env("IMSM_NO_PLATFORM") &&
            mpb->num_raid_devs > 0 && size && size != maxsize) {
-               pr_err("attempting to create a second "
-                       "volume with size less then remaining space. "
-                       "Aborting...\n");
+               pr_err("attempting to create a second volume with size less then remaining space. Aborting...\n");
                return 0;
        }
        cnt = 0;
@@ -6299,8 +6266,7 @@ static int validate_geometry_imsm(struct supertype *st, int level, int layout,
                                count = count_volumes(super->hba->path,
                                                      super->orom->dpa, verbose);
                                if (super->orom->vphba <= count) {
-                                       pr_vrb(": platform does not support more"
-                                              " than %d raid volumes.\n",
+                                       pr_vrb(": platform does not support more than %d raid volumes.\n",
                                               super->orom->vphba);
                                        return 0;
                                }
@@ -6584,7 +6550,7 @@ static void update_recovery_start(struct intel_super *super,
                 * IMSM_ORD_REBUILD, so assume they are missing and the
                 * disk_ord_tbl was not correctly updated
                 */
-               dprintf("%s: failed to locate out-of-sync disk\n", __func__);
+               dprintf("failed to locate out-of-sync disk\n");
                return;
        }
 
@@ -6618,14 +6584,12 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
        /* do not assemble arrays when not all attributes are supported */
        if (imsm_check_attributes(mpb->attributes) == 0) {
                sb_errors = 1;
-               pr_err("Unsupported attributes in IMSM metadata."
-                       "Arrays activation is blocked.\n");
+               pr_err("Unsupported attributes in IMSM metadata.Arrays activation is blocked.\n");
        }
 
        /* check for bad blocks */
        if (imsm_bbm_log_size(super->anchor)) {
-               pr_err("BBM log found in IMSM metadata."
-                      "Arrays activation is blocked.\n");
+               pr_err("BBM log found in IMSM metadata.Arrays activation is blocked.\n");
                sb_errors = 1;
        }
 
@@ -6659,8 +6623,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                 */
                if (dev->vol.migr_state &&
                    (migr_type(dev) == MIGR_STATE_CHANGE)) {
-                       pr_err("cannot assemble volume '%.16s':"
-                               " unsupported migration in progress\n",
+                       pr_err("cannot assemble volume '%.16s': unsupported migration in progress\n",
                                dev->volume);
                        continue;
                }
@@ -6682,8 +6645,7 @@ static struct mdinfo *container_content_imsm(struct supertype *st, char *subarra
                                                 map->num_members, /* raid disks */
                                                 &chunk, join_u32(dev->size_low, dev->size_high),
                                                 1 /* verbose */)) {
-                       pr_err("IMSM RAID geometry validation"
-                               " failed.  Array %s activation is blocked.\n",
+                       pr_err("IMSM RAID geometry validation failed.  Array %s activation is blocked.\n",
                                dev->volume);
                        this->array.state |=
                          (1<<MD_SB_BLOCK_CONTAINER_RESHAPE) |
@@ -6905,8 +6867,7 @@ static int imsm_open_new(struct supertype *c, struct active_array *a,
        struct imsm_super *mpb = super->anchor;
 
        if (atoi(inst) >= mpb->num_raid_devs) {
-               pr_err("%s: subarry index %d, out of range\n",
-                       __func__, atoi(inst));
+               pr_err("subarry index %d, out of range\n", atoi(inst));
                return -ENODEV;
        }
 
@@ -7319,7 +7280,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
        case IMSM_T_STATE_NORMAL: /* transition to normal state */
                dprintf("normal: ");
                if (is_rebuilding(dev)) {
-                       dprintf("while rebuilding");
+                       dprintf_cont("while rebuilding");
                        /* check if recovery is really finished */
                        for (mdi = a->info.devs; mdi ; mdi = mdi->next)
                                if (mdi->recovery_start != MaxSector) {
@@ -7327,8 +7288,8 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
                                        break;
                                }
                        if (recovery_not_finished) {
-                               dprintf("\nimsm: Rebuild has not finished yet, "
-                                               "state not changed");
+                               dprintf_cont("\n");
+                               dprintf("Rebuild has not finished yet, state not changed");
                                if (a->last_checkpoint < mdi->recovery_start) {
                                        a->last_checkpoint = mdi->recovery_start;
                                        super->updates_pending++;
@@ -7343,7 +7304,7 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
                        break;
                }
                if (is_gen_migration(dev)) {
-                       dprintf("while general migration");
+                       dprintf_cont("while general migration");
                        if (a->last_checkpoint >= a->info.component_size)
                                end_migration(dev, super, map_state);
                        else
@@ -7355,26 +7316,26 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
                }
        break;
        case IMSM_T_STATE_DEGRADED: /* transition to degraded state */
-               dprintf("degraded: ");
+               dprintf_cont("degraded: ");
                if ((map->map_state != map_state) &&
                    !dev->vol.migr_state) {
-                       dprintf("mark degraded");
+                       dprintf_cont("mark degraded");
                        map->map_state = map_state;
                        super->updates_pending++;
                        a->last_checkpoint = 0;
                        break;
                }
                if (is_rebuilding(dev)) {
-                       dprintf("while rebuilding.");
+                       dprintf_cont("while rebuilding.");
                        if (map->map_state != map_state)  {
-                               dprintf(" Map state change");
+                               dprintf_cont(" Map state change");
                                end_migration(dev, super, map_state);
                                super->updates_pending++;
                        }
                        break;
                }
                if (is_gen_migration(dev)) {
-                       dprintf("while general migration");
+                       dprintf_cont("while general migration");
                        if (a->last_checkpoint >= a->info.component_size)
                                end_migration(dev, super, map_state);
                        else {
@@ -7385,22 +7346,22 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
                        break;
                }
                if (is_initializing(dev)) {
-                       dprintf("while initialization.");
+                       dprintf_cont("while initialization.");
                        map->map_state = map_state;
                        super->updates_pending++;
                        break;
                }
        break;
        case IMSM_T_STATE_FAILED: /* transition to failed state */
-               dprintf("failed: ");
+               dprintf_cont("failed: ");
                if (is_gen_migration(dev)) {
-                       dprintf("while general migration");
+                       dprintf_cont("while general migration");
                        map->map_state = map_state;
                        super->updates_pending++;
                        break;
                }
                if (map->map_state != map_state) {
-                       dprintf("mark failed");
+                       dprintf_cont("mark failed");
                        end_migration(dev, super, map_state);
                        super->updates_pending++;
                        a->last_checkpoint = 0;
@@ -7408,10 +7369,9 @@ static void imsm_set_disk(struct active_array *a, int n, int state)
                }
        break;
        default:
-               dprintf("state %i\n", map_state);
+               dprintf_cont("state %i\n", map_state);
        }
-       dprintf("\n");
-
+       dprintf_cont("\n");
 }
 
 static int store_imsm_mpb(int fd, struct imsm_super *mpb)
@@ -7473,7 +7433,7 @@ static struct dl *imsm_readd(struct intel_super *super, int idx, struct active_a
                dl = NULL;
 
        if (dl)
-               dprintf("%s: found %x:%x\n", __func__, dl->major, dl->minor);
+               dprintf("found %x:%x\n", dl->major, dl->minor);
 
        return dl;
 }
@@ -7674,8 +7634,7 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
        /* Cannot activate another spare if rebuild is in progress already
         */
        if (is_rebuilding(dev)) {
-               dprintf("imsm: No spare activation allowed. "
-                       "Rebuild in progress already.\n");
+               dprintf("imsm: No spare activation allowed. Rebuild in progress already.\n");
                return NULL;
        }
 
@@ -7695,8 +7654,7 @@ static struct mdinfo *imsm_activate_spare(struct active_array *a,
         * are removed from container.
         */
        if (failed) {
-               dprintf("found failed disks in %.*s, check if there another"
-                       "failed sub-array.\n",
+               dprintf("found failed disks in %.*s, check if there anotherfailed sub-array.\n",
                        MAX_RAID_SERIAL_LEN, dev->volume);
                /* check if states of the other volumes allow for rebuild */
                for (i = 0; i <  super->anchor->num_raid_devs; i++) {
@@ -7840,8 +7798,7 @@ static int remove_disk_super(struct intel_super *super, int major, int minor)
                                super->disks = dl->next;
                        dl->next = NULL;
                        __free_imsm_disk(dl);
-                       dprintf("%s: removed %x:%x\n",
-                               __func__, major, minor);
+                       dprintf("removed %x:%x\n", major, minor);
                        break;
                }
                prev = dl;
@@ -7867,9 +7824,8 @@ static int add_remove_disk_update(struct intel_super *super)
                        disk_cfg->next = super->disks;
                        super->disks = disk_cfg;
                        check_degraded = 1;
-                       dprintf("%s: added %x:%x\n",
-                               __func__, disk_cfg->major,
-                               disk_cfg->minor);
+                       dprintf("added %x:%x\n",
+                               disk_cfg->major, disk_cfg->minor);
                } else if (disk_cfg->action == DISK_REMOVE) {
                        dprintf("Disk remove action processed: %x.%x\n",
                                disk_cfg->major, disk_cfg->minor);
@@ -7901,7 +7857,7 @@ static int apply_reshape_migration_update(struct imsm_update_reshape_migration *
        void **tofree = NULL;
        int ret_val = 0;
 
-       dprintf("apply_reshape_migration_update()\n");
+       dprintf("(enter)\n");
        if ((u->subdev < 0) ||
            (u->subdev > 1)) {
                dprintf("imsm: Error: Wrong subdev: %i\n", u->subdev);
@@ -7979,8 +7935,7 @@ static int apply_reshape_migration_update(struct imsm_update_reshape_migration *
                                new_disk = get_disk_super(super,
                                                        major(u->new_disks[0]),
                                                        minor(u->new_disks[0]));
-                               dprintf("imsm: new disk for reshape is: %i:%i "
-                                       "(%p, index = %i)\n",
+                               dprintf("imsm: new disk for reshape is: %i:%i (%p, index = %i)\n",
                                        major(u->new_disks[0]),
                                        minor(u->new_disks[0]),
                                        new_disk, new_disk->index);
@@ -8021,7 +7976,7 @@ static int apply_size_change_update(struct imsm_update_size_change *u,
        struct intel_dev *id;
        int ret_val = 0;
 
-       dprintf("apply_size_change_update()\n");
+       dprintf("(enter)\n");
        if ((u->subdev < 0) ||
            (u->subdev > 1)) {
                dprintf("imsm: Error: Wrong subdev: %i\n", u->subdev);
@@ -8038,8 +7993,7 @@ static int apply_size_change_update(struct imsm_update_size_change *u,
                        /* calculate new size
                         */
                        blocks_per_member = u->new_size / used_disks;
-                       dprintf("imsm: apply_size_change_update(size: %llu, "
-                               "blocks per member: %llu)\n",
+                       dprintf("(size: %llu, blocks per member: %llu)\n",
                                u->new_size, blocks_per_member);
                        set_blocks_per_member(map, blocks_per_member);
                        imsm_set_array_size(dev, u->new_size);
@@ -8081,8 +8035,7 @@ static int apply_update_activate_spare(struct imsm_update_activate_spare *u,
                                break;
 
                if (!dl) {
-                       pr_err("error: imsm_activate_spare passed "
-                               "an unknown disk (index: %d)\n",
+                       pr_err("error: imsm_activate_spare passed an unknown disk (index: %d)\n",
                                u->dl->index);
                        return 0;
                }
@@ -8182,15 +8135,14 @@ static int apply_reshape_container_disks_update(struct imsm_update_reshape *u,
        int ret_val = 0;
        unsigned int dev_id;
 
-       dprintf("imsm: apply_reshape_container_disks_update()\n");
+       dprintf("(enter)\n");
 
        /* enable spares to use in array */
        for (i = 0; i < delta_disks; i++) {
                new_disk = get_disk_super(super,
                                          major(u->new_disks[i]),
                                          minor(u->new_disks[i]));
-               dprintf("imsm: new disk for reshape is: %i:%i "
-                       "(%p, index = %i)\n",
+               dprintf("imsm: new disk for reshape is: %i:%i (%p, index = %i)\n",
                        major(u->new_disks[i]), minor(u->new_disks[i]),
                        new_disk, new_disk->index);
                if ((new_disk == NULL) ||
@@ -8423,8 +8375,7 @@ static void imsm_process_update(struct supertype *st,
                struct imsm_update_general_migration_checkpoint *u =
                                                        (void *)update->buf;
 
-               dprintf("imsm: process_update() "
-                       "for update_general_migration_checkpoint called\n");
+               dprintf("called for update_general_migration_checkpoint\n");
 
                /* find device under general migration */
                for (id = super->devlist ; id; id = id->next) {
@@ -8493,15 +8444,14 @@ static void imsm_process_update(struct supertype *st,
 
                /* handle racing creates: first come first serve */
                if (u->dev_idx < mpb->num_raid_devs) {
-                       dprintf("%s: subarray %d already defined\n",
-                               __func__, u->dev_idx);
+                       dprintf("subarray %d already defined\n", u->dev_idx);
                        goto create_error;
                }
 
                /* check update is next in sequence */
                if (u->dev_idx != mpb->num_raid_devs) {
-                       dprintf("%s: can not create array %d expected index %d\n",
-                               __func__, u->dev_idx, mpb->num_raid_devs);
+                       dprintf("can not create array %d expected index %d\n",
+                               u->dev_idx, mpb->num_raid_devs);
                        goto create_error;
                }
 
@@ -8526,14 +8476,14 @@ static void imsm_process_update(struct supertype *st,
                                continue;
 
                        if (disks_overlap(super, i, u)) {
-                               dprintf("%s: arrays overlap\n", __func__);
+                               dprintf("arrays overlap\n");
                                goto create_error;
                        }
                }
 
                /* check that prepare update was successful */
                if (!update->space) {
-                       dprintf("%s: prepare update failed\n", __func__);
+                       dprintf("prepare update failed\n");
                        goto create_error;
                }
 
@@ -8545,7 +8495,7 @@ static void imsm_process_update(struct supertype *st,
                for (i = 0; i < new_map->num_members; i++) {
                        dl = serial_to_dl(inf[i].serial, super);
                        if (!dl) {
-                               dprintf("%s: disk disappeared\n", __func__);
+                               dprintf("disk disappeared\n");
                                goto create_error;
                        }
                }
@@ -8664,8 +8614,7 @@ static void imsm_process_update(struct supertype *st,
                break;
        }
        default:
-               pr_err("error: unsuported process update type:"
-                       "(type: %d)\n", type);
+               pr_err("error: unsuported process update type:(type: %d)\n",    type);
        }
 }
 
@@ -8696,8 +8645,7 @@ static int imsm_prepare_update(struct supertype *st,
        case update_general_migration_checkpoint:
                if (update->len < (int)sizeof(struct imsm_update_general_migration_checkpoint))
                        return 0;
-               dprintf("imsm: prepare_update() "
-                       "for update_general_migration_checkpoint called\n");
+               dprintf("called for update_general_migration_checkpoint\n");
                break;
        case update_takeover: {
                struct imsm_update_takeover *u = (void *)update->buf;
@@ -8746,7 +8694,7 @@ static int imsm_prepare_update(struct supertype *st,
                if (update->len < (int)sizeof(*u))
                        return 0;
 
-               dprintf("imsm: imsm_prepare_update() for update_reshape\n");
+               dprintf("for update_reshape\n");
 
                for (dl = super->devlist; dl; dl = dl->next) {
                        int size = sizeof_imsm_dev(dl->dev, 1);
@@ -8781,7 +8729,7 @@ static int imsm_prepare_update(struct supertype *st,
                if (update->len < (int)sizeof(*u))
                        return 0;
 
-               dprintf("imsm: imsm_prepare_update() for update_reshape\n");
+               dprintf("for update_reshape\n");
 
                /* add space for bigger array in update
                 */
@@ -8943,8 +8891,7 @@ static void imsm_delete(struct intel_super *super, struct dl **dlp, unsigned ind
        int i, j, num_members;
        __u32 ord;
 
-       dprintf("%s: deleting device[%d] from imsm_super\n",
-               __func__, index);
+       dprintf("deleting device[%d] from imsm_super\n", index);
 
        /* shift all indexes down one */
        for (iter = super->disks; iter; iter = iter->next)
@@ -9368,8 +9315,7 @@ int save_checkpoint_imsm(struct supertype *st, struct mdinfo *info, int state)
        unsigned long long curr_migr_unit;
 
        if (load_imsm_migr_rec(super, info) != 0) {
-               dprintf("imsm: ERROR: Cannot read migration record "
-                       "for checkpoint save.\n");
+               dprintf("imsm: ERROR: Cannot read migration record for checkpoint save.\n");
                return 1;
        }
 
@@ -9393,8 +9339,7 @@ int save_checkpoint_imsm(struct supertype *st, struct mdinfo *info, int state)
                __cpu_to_le32(curr_migr_unit *
                              __le32_to_cpu(super->migr_rec->dest_depth_per_unit));
        if (write_imsm_migr_rec(st) < 0) {
-               dprintf("imsm: Cannot write migration record "
-                       "outside backup area\n");
+               dprintf("imsm: Cannot write migration record outside backup area\n");
                return 1;
        }
 
@@ -9505,16 +9450,14 @@ int recover_backup_imsm(struct supertype *st, struct mdinfo *info)
                                                         new_disks,
                                                         super,
                                                         id->dev)) {
-               pr_err("Cannot restore data from backup."
-                      " Too many failed disks\n");
+               pr_err("Cannot restore data from backup. Too many failed disks\n");
                goto abort;
        }
 
        if (save_checkpoint_imsm(st, info, UNIT_SRC_NORMAL)) {
                /* ignore error == 2, this can mean end of reshape here
                 */
-               dprintf("imsm: Cannot write checkpoint to "
-                       "migration record (UNIT_SRC_NORMAL) during restart\n");
+               dprintf("imsm: Cannot write checkpoint to migration record (UNIT_SRC_NORMAL) during restart\n");
        } else
                retval = 0;
 
@@ -9589,22 +9532,19 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
        struct mdinfo *info, *member;
        int devices_that_can_grow = 0;
 
-       dprintf("imsm: imsm_reshape_is_allowed_on_container(ENTER): "
-               "st->devnm = (%s)\n", st->devnm);
+       dprintf("imsm: imsm_reshape_is_allowed_on_container(ENTER): st->devnm = (%s)\n", st->devnm);
 
        if (geo->size > 0 ||
            geo->level != UnSet ||
            geo->layout != UnSet ||
            geo->chunksize != 0 ||
            geo->raid_disks == UnSet) {
-               dprintf("imsm: Container operation is allowed for "
-                       "raid disks number change only.\n");
+               dprintf("imsm: Container operation is allowed for raid disks number change only.\n");
                return ret_val;
        }
 
        if (direction == ROLLBACK_METADATA_CHANGES) {
-               dprintf("imsm: Metadata changes rollback is not supported for "
-                       "container operation.\n");
+               dprintf("imsm: Metadata changes rollback is not supported for container operation.\n");
                return ret_val;
        }
 
@@ -9619,8 +9559,7 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                        /* we work on container for Online Capacity Expansion
                         * only so raid_disks has to grow
                         */
-                       dprintf("imsm: for container operation raid disks "
-                               "increase is required\n");
+                       dprintf("imsm: for container operation raid disks increase is required\n");
                        break;
                }
 
@@ -9628,8 +9567,7 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                    (info->array.level != 5)) {
                        /* we cannot use this container with other raid level
                         */
-                       dprintf("imsm: for container operation wrong"
-                               " raid level (%i) detected\n",
+                       dprintf("imsm: for container operation wrong raid level (%i) detected\n",
                                info->array.level);
                        break;
                } else {
@@ -9640,8 +9578,7 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                        if (!is_raid_level_supported(super->orom,
                                                     member->array.level,
                                                     geo->raid_disks)) {
-                               dprintf("platform does not support raid%d with"
-                                       " %d disk%s\n",
+                               dprintf("platform does not support raid%d with %d disk%s\n",
                                         info->array.level,
                                         geo->raid_disks,
                                         geo->raid_disks > 1 ? "s" : "");
@@ -9651,8 +9588,7 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                         */
                        if (info->component_size %
                            (info->array.chunk_size/512)) {
-                               dprintf("Component size is not aligned to "
-                                       "chunk size\n");
+                               dprintf("Component size is not aligned to chunk size\n");
                                break;
                        }
                }
@@ -9680,9 +9616,9 @@ static int imsm_reshape_is_allowed_on_container(struct supertype *st,
                ret_val = 1;
 
        if (ret_val)
-               dprintf("\tContainer operation allowed\n");
+               dprintf("Container operation allowed\n");
        else
-               dprintf("\tError: %i\n", ret_val);
+               dprintf("Error: %i\n", ret_val);
 
        return ret_val;
 }
@@ -9720,8 +9656,7 @@ static int imsm_create_metadata_update_for_reshape(
        int delta_disks = 0;
        struct mdinfo *dev;
 
-       dprintf("imsm_update_metadata_for_reshape(enter) raid_disks = %i\n",
-               geo->raid_disks);
+       dprintf("(enter) raid_disks = %i\n", geo->raid_disks);
 
        delta_disks = geo->raid_disks - old_raid_disks;
 
@@ -9742,8 +9677,7 @@ static int imsm_create_metadata_update_for_reshape(
 
        if (spares == NULL
            || delta_disks > spares->array.spare_disks) {
-               pr_err("imsm: ERROR: Cannot get spare devices "
-                       "for %s.\n", geo->dev_name);
+               pr_err("imsm: ERROR: Cannot get spare devices for %s.\n", geo->dev_name);
                i = -1;
                goto abort;
        }
@@ -9775,12 +9709,12 @@ abort:
 
        dprintf("imsm: reshape update preparation :");
        if (i == delta_disks) {
-               dprintf(" OK\n");
+               dprintf_cont(" OK\n");
                *updatep = u;
                return update_memory_size;
        }
        free(u);
-       dprintf(" Error\n");
+       dprintf_cont(" Error\n");
 
        return 0;
 }
@@ -9799,8 +9733,7 @@ static int imsm_create_metadata_update_for_size_change(
        int update_memory_size = 0;
        struct imsm_update_size_change *u = NULL;
 
-       dprintf("imsm_create_metadata_update_for_size_change(enter)"
-               " New size = %llu\n", geo->size);
+       dprintf("(enter) New size = %llu\n", geo->size);
 
        /* size of all update data without anchor */
        update_memory_size = sizeof(struct imsm_update_size_change);
@@ -9832,8 +9765,7 @@ static int imsm_create_metadata_update_for_migration(
        struct imsm_dev *dev;
        int previous_level = -1;
 
-       dprintf("imsm_create_metadata_update_for_migration(enter)"
-               " New Level = %i\n", geo->level);
+       dprintf("(enter) New Level = %i\n", geo->level);
 
        /* size of all update data without anchor */
        update_memory_size = sizeof(struct imsm_update_reshape_migration);
@@ -9858,8 +9790,7 @@ static int imsm_create_metadata_update_for_migration(
 
                        if (geo->chunksize != current_chunk_size) {
                                u->new_chunksize = geo->chunksize / 1024;
-                               dprintf("imsm: "
-                                       "chunk size change from %i to %i\n",
+                               dprintf("imsm: chunk size change from %i to %i\n",
                                        current_chunk_size, u->new_chunksize);
                        }
                        previous_level = map->raid_level;
@@ -9874,8 +9805,7 @@ static int imsm_create_metadata_update_for_migration(
                        free(u);
                        sysfs_free(spares);
                        update_memory_size = 0;
-                       dprintf("error: cannot get spare device "
-                               "for requested migration");
+                       dprintf("error: cannot get spare device for requested migration");
                        return 0;
                }
                sysfs_free(spares);
@@ -9943,9 +9873,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                        if (geo->level == 5) {
                                change = CH_MIGRATION;
                                if (geo->layout != ALGORITHM_LEFT_ASYMMETRIC) {
-                                       pr_err("Error. Requested Layout "
-                                              "not supported (left-asymmetric layout "
-                                              "is supported only)!\n");
+                                       pr_err("Error. Requested Layout not supported (left-asymmetric layout is supported only)!\n");
                                        change = -1;
                                        goto analyse_change_exit;
                                }
@@ -9970,8 +9898,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                        break;
                }
                if (change == -1) {
-                       pr_err("Error. Level Migration from %d to %d "
-                              "not supported!\n",
+                       pr_err("Error. Level Migration from %d to %d not supported!\n",
                               info.array.level, geo->level);
                        goto analyse_change_exit;
                }
@@ -9992,8 +9919,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                        geo->layout = 0;
                        geo->level = 5;
                } else {
-                       pr_err("Error. Layout Migration from %d to %d "
-                              "not supported!\n",
+                       pr_err("Error. Layout Migration from %d to %d not supported!\n",
                               info.array.layout, geo->layout);
                        change = -1;
                        goto analyse_change_exit;
@@ -10027,9 +9953,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                                    chunk * 1024,
                                    geo->size * 2);
                if (geo->size == 0) {
-                       pr_err("Error. Size expansion is " \
-                                  "supported only (current size is %llu, " \
-                                  "requested size /rounded/ is 0).\n",
+                       pr_err("Error. Size expansion is supported only (current size is %llu, requested size /rounded/ is 0).\n",
                                   current_size);
                        goto analyse_change_exit;
                }
@@ -10037,14 +9961,12 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
 
        if ((current_size != geo->size) && (geo->size > 0)) {
                if (change != -1) {
-                       pr_err("Error. Size change should be the only "
-                               "one at a time.\n");
+                       pr_err("Error. Size change should be the only one at a time.\n");
                        change = -1;
                        goto analyse_change_exit;
                }
                if ((super->current_vol + 1) != super->anchor->num_raid_devs) {
-                       pr_err("Error. The last volume in container "
-                              "can be expanded only (%i/%s).\n",
+                       pr_err("Error. The last volume in container can be expanded only (%i/%s).\n",
                               super->current_vol, st->devnm);
                        goto analyse_change_exit;
                }
@@ -10069,8 +9991,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                        /* requested size change to the maximum available size
                         */
                        if (max_size == 0) {
-                               pr_err("Error. Cannot find "
-                                       "maximum available space.\n");
+                               pr_err("Error. Cannot find maximum available space.\n");
                                change = -1;
                                goto analyse_change_exit;
                        } else
@@ -10088,17 +10009,12 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                        dprintf("Prepare update for size change to %llu\n",
                                geo->size );
                        if (current_size >= geo->size) {
-                               pr_err("Error. Size expansion is "
-                                      "supported only (current size is %llu, "
-                                      "requested size /rounded/ is %llu).\n",
+                               pr_err("Error. Size expansion is supported only (current size is %llu, requested size /rounded/ is %llu).\n",
                                       current_size, geo->size);
                                goto analyse_change_exit;
                        }
                        if (max_size && geo->size > max_size) {
-                               pr_err("Error. Requested size is larger "
-                                      "than maximum available size (maximum "
-                                      "available size is %llu, "
-                                      "requested size /rounded/ is %llu).\n",
+                               pr_err("Error. Requested size is larger than maximum available size (maximum available size is %llu, requested size /rounded/ is %llu).\n",
                                       max_size, geo->size);
                                goto analyse_change_exit;
                        }
@@ -10121,9 +10037,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
                struct imsm_super *mpb = super->anchor;
 
                if (mpb->num_raid_devs > 1) {
-                       pr_err("Error. Cannot perform operation on %s"
-                              "- for this operation it MUST be single "
-                              "array in container\n",
+                       pr_err("Error. Cannot perform operation on %s- for this operation it MUST be single array in container\n",
                               geo->dev_name);
                        change = -1;
                }
@@ -10132,8 +10046,7 @@ enum imsm_reshape_type imsm_analyze_change(struct supertype *st,
 analyse_change_exit:
        if ((direction == ROLLBACK_METADATA_CHANGES) &&
             ((change == CH_MIGRATION) || (change == CH_TAKEOVER))) {
-               dprintf("imsm: Metadata changes rollback is not supported for "
-                       "migration and takeover operations.\n");
+               dprintf("imsm: Metadata changes rollback is not supported for migration and takeover operations.\n");
                change = -1;
        }
        return change;
@@ -10179,7 +10092,7 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size,
        int ret_val = 1;
        struct geo_params geo;
 
-       dprintf("imsm: reshape_super called.\n");
+       dprintf("(enter)\n");
 
        memset(&geo, 0, sizeof(struct geo_params));
 
@@ -10193,8 +10106,8 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size,
        if (delta_disks != UnSet)
                geo.raid_disks += delta_disks;
 
-       dprintf("\tfor level      : %i\n", geo.level);
-       dprintf("\tfor raid_disks : %i\n", geo.raid_disks);
+       dprintf("for level      : %i\n", geo.level);
+       dprintf("for raid_disks : %i\n", geo.raid_disks);
 
        if (experimental() == 0)
                return ret_val;
@@ -10227,8 +10140,7 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size,
                                free(u);
 
                } else {
-                       pr_err("(imsm) Operation "
-                               "is not allowed on this container\n");
+                       pr_err("(imsm) Operation is not allowed on this container\n");
                }
        } else {
                /* On volume level we support following operations
@@ -10266,8 +10178,7 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size,
                                imsm_create_metadata_update_for_migration(
                                        st, &geo, &u);
                        if (len < 1) {
-                               dprintf("imsm: "
-                                       "Cannot prepare update\n");
+                               dprintf("imsm: Cannot prepare update\n");
                                break;
                        }
                        ret_val = 0;
@@ -10286,8 +10197,7 @@ static int imsm_reshape_super(struct supertype *st, unsigned long long size,
                                imsm_create_metadata_update_for_size_change(
                                        st, &geo, &u);
                        if (len < 1) {
-                               dprintf("imsm: "
-                                       "Cannot prepare update\n");
+                               dprintf("imsm: Cannot prepare update\n");
                                break;
                        }
                        ret_val = 0;
@@ -10331,21 +10241,18 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
        unsigned long long position_to_set = to_complete / ndata;
 
        if (fd < 0) {
-               dprintf("imsm: wait_for_reshape_imsm() "
-                       "cannot open reshape_position\n");
+               dprintf("cannot open reshape_position\n");
                return 1;
        }
 
        if (sysfs_fd_get_ll(fd, &completed) < 0) {
-               dprintf("imsm: wait_for_reshape_imsm() "
-                       "cannot read reshape_position (no reshape in progres)\n");
+               dprintf("cannot read reshape_position (no reshape in progres)\n");
                close(fd);
                return 0;
        }
 
        if (completed > position_to_set) {
-               dprintf("imsm: wait_for_reshape_imsm() "
-                       "wrong next position to set %llu (%llu)\n",
+               dprintf("wrong next position to set %llu (%llu)\n",
                        to_complete, position_to_set);
                close(fd);
                return -1;
@@ -10353,8 +10260,7 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
        dprintf("Position set: %llu\n", position_to_set);
        if (sysfs_set_num(sra, NULL, "sync_max",
                          position_to_set) != 0) {
-               dprintf("imsm: wait_for_reshape_imsm() "
-                       "cannot set reshape position to %llu\n",
+               dprintf("cannot set reshape position to %llu\n",
                        position_to_set);
                close(fd);
                return -1;
@@ -10368,8 +10274,7 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
                                strncmp(action, "reshape", 7) != 0)
                        break;
                if (sysfs_fd_get_ll(fd, &completed) < 0) {
-                       dprintf("imsm: wait_for_reshape_imsm() "
-                               "cannot read reshape_position (in loop)\n");
+                       dprintf("cannot read reshape_position (in loop)\n");
                        close(fd);
                        return 1;
                }
@@ -10510,8 +10415,7 @@ static int imsm_manage_reshape(
                init_migr_record_imsm(st, dev, sra);
        else {
                if (__le32_to_cpu(migr_rec->rec_status) != UNIT_SRC_NORMAL) {
-                       dprintf("imsm: cannot restart migration when data "
-                               "are present in copy area.\n");
+                       dprintf("imsm: cannot restart migration when data are present in copy area.\n");
                        goto abort;
                }
                /* Save checkpoint to update migration record for current
@@ -10521,9 +10425,7 @@ static int imsm_manage_reshape(
                if (save_checkpoint_imsm(st, sra, UNIT_SRC_NORMAL) == 1) {
                        /* ignore error == 2, this can mean end of reshape here
                         */
-                       dprintf("imsm: Cannot write checkpoint to "
-                               "migration record (UNIT_SRC_NORMAL, "
-                               "initial save)\n");
+                       dprintf("imsm: Cannot write checkpoint to migration record (UNIT_SRC_NORMAL, initial save)\n");
                        goto abort;
                }
        }
@@ -10554,8 +10456,7 @@ static int imsm_manage_reshape(
                 */
                degraded = check_degradation_change(sra, fds, degraded);
                if (degraded > 1) {
-                       dprintf("imsm: Abort reshape due to degradation"
-                               " level (%i)\n", degraded);
+                       dprintf("imsm: Abort reshape due to degradation level (%i)\n", degraded);
                        goto abort;
                }
 
@@ -10589,10 +10490,7 @@ static int imsm_manage_reshape(
                        if (next_step_filler)
                                next_step_filler = (old_data_stripe_length
                                                    - next_step_filler);
-                       dprintf("save_stripes() parameters: start = %llu,"
-                               "\tstart_src = %llu,\tnext_step*512 = %llu,"
-                               "\tstart_in_buf_shift = %llu,"
-                               "\tnext_step_filler = %llu\n",
+                       dprintf("save_stripes() parameters: start = %llu,\tstart_src = %llu,\tnext_step*512 = %llu,\tstart_in_buf_shift = %llu,\tnext_step_filler = %llu\n",
                                start, start_src, copy_length,
                                start_buf_shift, next_step_filler);
 
@@ -10602,8 +10500,7 @@ static int imsm_manage_reshape(
                                         copy_length +
                                         next_step_filler + start_buf_shift,
                                         buf)) {
-                               dprintf("imsm: Cannot save stripes"
-                                       " to buffer\n");
+                               dprintf("imsm: Cannot save stripes to buffer\n");
                                goto abort;
                        }
                        /* Convert data to destination format and store it
@@ -10611,14 +10508,12 @@ static int imsm_manage_reshape(
                         */
                        if (save_backup_imsm(st, dev, sra,
                                buf + start_buf_shift, copy_length)) {
-                               dprintf("imsm: Cannot save stripes to "
-                                       "target devices\n");
+                               dprintf("imsm: Cannot save stripes to target devices\n");
                                goto abort;
                        }
                        if (save_checkpoint_imsm(st, sra,
                                                 UNIT_SRC_IN_CP_AREA)) {
-                               dprintf("imsm: Cannot write checkpoint to "
-                                       "migration record (UNIT_SRC_IN_CP_AREA)\n");
+                               dprintf("imsm: Cannot write checkpoint to migration record (UNIT_SRC_IN_CP_AREA)\n");
                                goto abort;
                        }
                } else {
@@ -10649,8 +10544,7 @@ static int imsm_manage_reshape(
                if (save_checkpoint_imsm(st, sra, UNIT_SRC_NORMAL) == 1) {
                        /* ignore error == 2, this can mean end of reshape here
                         */
-                       dprintf("imsm: Cannot write checkpoint to "
-                               "migration record (UNIT_SRC_NORMAL)\n");
+                       dprintf("imsm: Cannot write checkpoint to migration record (UNIT_SRC_NORMAL)\n");
                        goto abort;
                }