Mariusz Dabrowski <mariusz.dabrowski@xxxxxxxxx> writes:
> mdadm recognizes devices with partition table as part of an RAID array
> and invalid warning message is displayed. After this fix proper warning
> messages are being displayed for MBR/GPT disks and devices with RAID
> metadata.
A couple of issues here - in general please respect proper coding
style. This patch is a mess :(
> Signed-off-by: Mariusz Dabrowski <mariusz.dabrowski@xxxxxxxxx>
> ---
> util.c | 28 +++++++++++++++++-----------
> 1 file changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/util.c b/util.c
> index c38ede7..5c845a0 100644
> --- a/util.c
> +++ b/util.c
> @@ -710,17 +710,23 @@ int check_raid(int fd, char *name)
>
> if (!st)
> return 0;
> - st->ss->load_super(st, fd, name);
> - /* Looks like a raid array .. */
> - pr_err("%s appears to be part of a raid array:\n",
> - name);
> - st->ss->getinfo_super(st, &info, NULL);
> - st->ss->free_super(st);
> - crtime = info.array.ctime;
> - level = map_num(pers, info.array.level);
> - if (!level) level = "-unknown-";
> - cont_err("level=%s devices=%d ctime=%s",
> - level, info.array.raid_disks, ctime(&crtime));
> + if (st->ss->add_to_super != NULL) {
> + st->ss->load_super(st, fd, name);
> + /* Looks like a raid array .. */
> + pr_err("%s appears to be part of a raid array:\n",
> + name);
Code lines are 80 characters - again when moving code around like this,
please do it properly.
> + st->ss->getinfo_super(st, &info, NULL);
> + st->ss->free_super(st);
> + crtime = info.array.ctime;
> + level = map_num(pers, info.array.level);
> + if (!level) level = "-unknown-";
if () and action should never be on the same line. Yes I know it was in
the old code, but then please fix it up when you move it around.
> + cont_err("level=%s devices=%d ctime=%s",
> + level, info.array.raid_disks, ctime(&crtime));
The indentation here is not acceptable, please do it properly like you
would in the kernel too.
> + }
> + else {
Ehm?
> + /* Looks like GPT or MBR */
> + pr_err("partition table exists on %s\n", name);
> + }
> return 1;
> }
Cheers,
Jes
--
To unsubscribe from this list: send the line "unsubscribe linux-raid" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
