From 32e5a4ee4c7a310c67faa7d1301af2ae6d75e884 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Mon, 9 Jul 2007 09:59:50 +1000 Subject: Improve error message when trying to create an array that already exists. From: Doug Ledford Simple bugfix. If an array already exists and we are asked to create this array, error out with an error message that makes sense to people instead of an error that the SET_ARRAY_INFO ioctl had an invalid argument. Plus a typo correction. --- Create.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Create.c b/Create.c index 2a4335a..08972ae 100644 --- a/Create.c +++ b/Create.c @@ -81,6 +81,15 @@ int Create(struct supertype *st, char *mddev, int mdfd, if (vers < 9000) { fprintf(stderr, Name ": Create requires md driver version 0.90.0 or later\n"); return 1; + } else { + mdu_array_info_t inf; + memset(&inf, 0, sizeof(inf)); + ioctl(mdfd, GET_ARRAY_INFO, &inf); + if (inf.working_disks != 0) { + fprintf(stderr, Name ": another array by this name" + " is already running.\n"); + return 1; + } } if (level == UnSet) { fprintf(stderr, @@ -225,7 +234,8 @@ int Create(struct supertype *st, char *mddev, int mdfd, } if (st->ss->major != 0 || st->minor_version != 90) - fprintf(stderr, Name ": Defaulting to verion %d.%d metadata\n", + fprintf(stderr, Name ": Defaulting to version" + " %d.%d metadata\n", st->ss->major, st->minor_version); } -- cgit