mdadm/Create: declaring an existing struct within same function
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>
This commit is contained in:
parent
dae131379f
commit
230a0dde09
12
Create.c
12
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:
|
||||
|
|
Loading…
Reference in New Issue