diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-11-04 20:50:39 +1100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2008-11-04 20:50:39 +1100 |
| commit | 197e3eb690a1088d3572d96e28ad79228a91f766 (patch) | |
| tree | b3ff582ce88b1453c225f6d25de90a300604d739 /Incremental.c | |
| parent | ad5bc697ad9bb52616c34b022fb014e890be6a2d (diff) | |
| download | mdadm-197e3eb690a1088d3572d96e28ad79228a91f766.tar.gz mdadm-197e3eb690a1088d3572d96e28ad79228a91f766.tar.xz mdadm-197e3eb690a1088d3572d96e28ad79228a91f766.zip | |
Quiet unitialized variable warnings
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'Incremental.c')
| -rw-r--r-- | Incremental.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Incremental.c b/Incremental.c index 37a762a..541fa99 100644 --- a/Incremental.c +++ b/Incremental.c @@ -81,7 +81,6 @@ int Incremental(char *devname, int verbose, int runstop, struct mddev_ident_s *array_list, *match; char chosen_name[1024]; int rv; - int devnum; struct map_ent *mp, *map = NULL; int dfd, mdfd; char *avail; @@ -284,7 +283,7 @@ int Incremental(char *devname, int verbose, int runstop, close(mdfd); return 2; } - sra = sysfs_read(mdfd, devnum, GET_DEVS); + sra = sysfs_read(mdfd, fd2devnum(mdfd), GET_DEVS); if (!sra || !sra->devs || sra->devs->disk.raid_disk >= 0) { /* It really should be 'none' - must be old buggy * kernel, and mdadm -I may not be able to complete. @@ -318,7 +317,7 @@ int Incremental(char *devname, int verbose, int runstop, strcpy(chosen_name, mp->path); - sra = sysfs_read(mdfd, devnum, (GET_DEVS | GET_STATE)); + sra = sysfs_read(mdfd, fd2devnum(mdfd), (GET_DEVS | GET_STATE)); sprintf(dn, "%d:%d", sra->devs->disk.major, sra->devs->disk.minor); @@ -442,7 +441,7 @@ int Incremental(char *devname, int verbose, int runstop, } close(bmfd); } - sra = sysfs_read(mdfd, devnum, 0); + sra = sysfs_read(mdfd, fd2devnum(mdfd), 0); if ((sra == NULL || active_disks >= info.array.working_disks) && trustworthy != FOREIGN) rv = ioctl(mdfd, RUN_ARRAY, NULL); |