diff --git a/Grow.c b/Grow.c index 79922c4..5ee97ca 100644 --- a/Grow.c +++ b/Grow.c @@ -2380,13 +2380,12 @@ static int raid10_reshape(char *container, int fd, char *devname, err = errno; if (err) { pr_err("Cannot set array shape for %s\n", - devname); - if (err == EBUSY && - (info->array.state & (1<array.state & (1<devname); - fprintf(stderr," Action options must come before device names\n"); + cont_err("Action options must come before device names\n"); exit(2); } } else { diff --git a/super-intel.c b/super-intel.c index 5a0250e..1b7d626 100644 --- a/super-intel.c +++ b/super-intel.c @@ -3840,9 +3840,9 @@ static int find_intel_hba_capability(int fd, struct intel_super *super, char *de hba = hba->next; } - fprintf(stderr, ").\n" - " Mixing devices attached to multiple controllers " - "is not allowed.\n"); + fprintf(stderr, ").\n"); + cont_err("Mixing devices attached to multiple controllers " + "is not allowed.\n"); } return 2; } diff --git a/util.c b/util.c index 3d2c3f0..c18105f 100644 --- a/util.c +++ b/util.c @@ -521,7 +521,7 @@ int check_ext2(int fd, char *name) size = sb[4]|(sb[5]|(sb[6]|sb[7]<<8)<<8)<<8; pr_err("%s appears to contain an ext2fs file system\n", name); - fprintf(stderr," size=%dK mtime=%s", + cont_err("size=%dK mtime=%s", size*(1<