On Mon, 23 Jan 2012 13:06:52 +0100 Lukasz Dorau <lukasz.dorau@xxxxxxxxx>
wrote:
> If the device's name is given in /etc/mdadm.conf, create_mddev()
> does not check if the map contains a device of this name (mdopen.c:140).
> If it does, the symlink of that name will be overwritten.
>
> create_mddev() has been changed. Now it checks if the map contains
> a device of the name given in /etc/mdadm.conf.
> If it does, the appropriate suffix is added to the given name.
>
> Signed-off-by: Lukasz Dorau <lukasz.dorau@xxxxxxxxx>
Can you please remind me what the big picture problem is here??
It seem like you are suggesting that if
/dev/md/thing
is given in mdadm.conf, but some other array is already assembled with the
name /dev/md/thing, then the array from mdadm.conf should be assembled as
/dev/md/thing0
or something like that - is that correct?
I don't think we want that. If there is a name conflict like this with a
name given in mdadm.conf, then one of the arrays should fail to assemble as
this is really a fairly serious configuration error.
Or did I misunderstand?
Thanks,
NeilBrown
> ---
> mdopen.c | 16 +++++++++++-----
> 1 files changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/mdopen.c b/mdopen.c
> index eac1c1f..3078de6 100644
> --- a/mdopen.c
> +++ b/mdopen.c
> @@ -147,10 +147,12 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
> char *cname;
> char devname[20];
> char cbuf[400];
> + struct map_ent *map = NULL;
> + int dev_conflict = 0;
> +
> if (chosen == NULL)
> chosen = cbuf;
>
> -
> if (autof == 0)
> autof = ci->autof;
>
> @@ -277,17 +279,21 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
> else
> sprintf(devname, "/dev/md%d", num);
>
> - if (cname[0] == 0 && name) {
> + if ((cname[0] != 0) && map_by_name(&map, cname))
> + dev_conflict = 1;
> +
> + if ((cname[0] == 0 && name) || dev_conflict) {
> /* Need to find a name if we can
> * We don't completely trust 'name'. Truncate to
> * reasonable length and remove '/'
> */
> char *cp;
> - struct map_ent *map = NULL;
> int conflict = 1;
> int unum = 0;
> int cnlen;
> - strncpy(cname, name, 200);
> +
> + if (!dev_conflict)
> + strncpy(cname, name, 200);
> cname[200] = 0;
> while ((cp = strchr(cname, '/')) != NULL)
> *cp = '-';
> @@ -312,7 +318,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
> }
> }
>
> - if (dev && dev[0] == '/')
> + if ((dev && dev[0] == '/') && (!dev_conflict))
> strcpy(chosen, dev);
> else if (cname[0] == 0)
> strcpy(chosen, devname);
Attachment:
signature.asc
Description: PGP signature
