]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Grow: Grow_continue_command: Avoid aliasing array variable
authorJes Sorensen <jsorensen@fb.com>
Tue, 2 May 2017 15:46:49 +0000 (11:46 -0400)
committerJes Sorensen <jsorensen@fb.com>
Tue, 2 May 2017 15:46:49 +0000 (11:46 -0400)
While this would cause a warning since the two are different types,
lets avoid aliasing an existing variable.

Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Grow.c

diff --git a/Grow.c b/Grow.c
index c6967ed1c9c7715a6b2c4ff5e1c05747c0261137..f4bd301a193f39d4826fbc4cfa305d01b8ce142e 100755 (executable)
--- a/Grow.c
+++ b/Grow.c
@@ -5075,7 +5075,7 @@ int Grow_continue_command(char *devname, int fd,
 
                cc = st->ss->container_content(st, subarray);
                for (content = cc; content ; content = content->next) {
-                       char *array;
+                       char *array_name;
                        int allow_reshape = 1;
 
                        if (content->reshape_active == 0)
@@ -5100,8 +5100,8 @@ int Grow_continue_command(char *devname, int fd,
                                goto Grow_continue_command_exit;
                        }
 
-                       array = strchr(content->text_version+1, '/')+1;
-                       mdstat = mdstat_by_subdev(array, container);
+                       array_name = strchr(content->text_version+1, '/')+1;
+                       mdstat = mdstat_by_subdev(array_name, container);
                        if (!mdstat)
                                continue;
                        if (mdstat->active == 0) {