]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
Grow: Do not shadow an existing variable
authorJes Sorensen <Jes.Sorensen@gmail.com>
Thu, 30 Mar 2017 14:46:01 +0000 (10:46 -0400)
committerJes Sorensen <Jes.Sorensen@gmail.com>
Thu, 30 Mar 2017 14:46:01 +0000 (10:46 -0400)
Declaring 'int rv' twice within the same function is asking for
trouble.

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

diff --git a/Grow.c b/Grow.c
index 0d551ce0785c7771969d3c41d32a21b288ff42ce..0c16d5b25deb0badbc20da4945cec1e058d23900 100755 (executable)
--- a/Grow.c
+++ b/Grow.c
@@ -1834,7 +1834,7 @@ int Grow_reshape(char *devname, int fd,
         * pre-requisite spare devices (mdmon owns final validation)
         */
        if (st->ss->external) {
-               int rv;
+               int retval;
 
                if (subarray) {
                        container = st->container_devnm;
@@ -1852,9 +1852,9 @@ int Grow_reshape(char *devname, int fd,
                        return 1;
                }
 
-               rv = st->ss->load_container(st, cfd, NULL);
+               retval = st->ss->load_container(st, cfd, NULL);
 
-               if (rv) {
+               if (retval) {
                        pr_err("Cannot read superblock for %s\n",
                                devname);
                        free(subarray);