Re: [PATCH v1] mdadm: add checking clustered bitmap in assemble mode

[jes.sorensen@gmail.com]

Zhilong Liu <zlliu@suse.com> writes:
> Both clustered and internal array don't need to specify
> --bitmap when assembling array.
>
> Signed-off-by: Zhilong Liu <zlliu@suse.com>
>
> diff --git a/mdadm.c b/mdadm.c
> index b5d89e4..4087f77 100644
> --- a/mdadm.c
> +++ b/mdadm.c
> @@ -1095,8 +1095,10 @@ int main(int argc, char *argv[])
>  				pr_err("bitmap file needed with -b in --assemble mode\n");
>  				exit(2);
>  			}
> -			if (strcmp(optarg, "internal") == 0) {
> -				pr_err("there is no need to specify --bitmap when assembling arrays with internal bitmaps\n");
> +			if (strcmp(optarg, "internal") == 0 ||
> +			    strcmp(optarg, "clustered") == 0) {
> +				pr_err("no need to specify --bitmap when assembling
> +					arrays with internal or clustered bitmap\n");
>  				continue;
>  			}
>  			bitmap_fd = open(optarg, O_RDWR);

This doesn't build - could you please send me a working patch.

Thanks,
Jes

cc -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter -ggdb -DSendmail=\""/usr/sbin/sendmail -t"\" -DCONFFILE=\"/etc/mdadm.conf\" -DCONFFILE2=\"/etc/mdadm/mdadm.conf\" -DMAP_DIR=\"/run/mdadm\" -DMAP_FILE=\"map\" -DMDMON_DIR=\"/run/mdadm\" -DFAILED_SLOTS_DIR=\"/run/mdadm/failed-slots\" -DNO_COROSYNC -DNO_DLM -DVERSION=\"4.0-6-g8383db9\" -DVERS_DATE="\"2017-03-06\"" -DUSE_PTHREADS -DBINDIR=\"/sbin\"  -c -o mdadm.o mdadm.c
mdadm.c: In function ‘main’:
mdadm.c:1100:12: error: missing terminating " character [-Werror]
     pr_err("no need to specify --bitmap when assembling
            ^
mdadm.c:1101:48: error: missing terminating " character [-Werror]
      arrays with internal or clustered bitmap\n");