]> git.ipfire.org Git - thirdparty/mdadm.git/commitdiff
mdadm/Create: declaring an existing struct within same function
authorZhilong Liu <zlliu@suse.com>
Sat, 1 Apr 2017 12:51:44 +0000 (20:51 +0800)
committerJes Sorensen <Jes.Sorensen@gmail.com>
Wed, 5 Apr 2017 15:47:04 +0000 (11:47 -0400)
Create:declaring 'struct stat stb' twice within the same
function, rename stb as stb2 when declares 'struct stat'
at the second time.

Signed-off-by: Zhilong Liu <zlliu@suse.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@gmail.com>
Create.c

index 32987af3e5c7921c1e72a339251f2dce69d8e940..ba24606f86abfa8ef3271e97d7b453d6cc00387f 100644 (file)
--- a/Create.c
+++ b/Create.c
@@ -868,7 +868,7 @@ int Create(struct supertype *st, char *mddev,
                for (dnum=0, raid_disk_num=0, dv = devlist ; dv ;
                     dv=(dv->next)?(dv->next):moved_disk, dnum++) {
                        int fd;
-                       struct stat stb;
+                       struct stat stb2;
                        struct mdinfo *inf = &infos[dnum];
 
                        if (dnum >= total_slots)
@@ -924,9 +924,9 @@ int Create(struct supertype *st, char *mddev,
                                                        dv->devname);
                                                goto abort_locked;
                                        }
-                                       fstat(fd, &stb);
-                                       inf->disk.major = major(stb.st_rdev);
-                                       inf->disk.minor = minor(stb.st_rdev);
+                                       fstat(fd, &stb2);
+                                       inf->disk.major = major(stb2.st_rdev);
+                                       inf->disk.minor = minor(stb2.st_rdev);
                                }
                                if (fd >= 0)
                                        remove_partitions(fd);
@@ -947,8 +947,8 @@ int Create(struct supertype *st, char *mddev,
 
                                if (!have_container) {
                                        /* getinfo_super might have lost these ... */
-                                       inf->disk.major = major(stb.st_rdev);
-                                       inf->disk.minor = minor(stb.st_rdev);
+                                       inf->disk.major = major(stb2.st_rdev);
+                                       inf->disk.minor = minor(stb2.st_rdev);
                                }
                                break;
                        case 2: