diff options
| author | Neil Brown <neilb@suse.de> | 2005-04-04 05:16:13 +0000 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2005-04-04 05:16:13 +0000 |
| commit | 0df46c2ad8872a9d6e5832f3098d12a7e0d2eb01 (patch) | |
| tree | b328e05ae148e9d2627a4a9e62c1b6a705136c03 /Monitor.c | |
| parent | 8d80900b492998a112eda80614a793012bee2770 (diff) | |
| download | mdadm-0df46c2ad8872a9d6e5832f3098d12a7e0d2eb01.tar.gz mdadm-0df46c2ad8872a9d6e5832f3098d12a7e0d2eb01.tar.xz mdadm-0df46c2ad8872a9d6e5832f3098d12a7e0d2eb01.zip | |
Change MAJOR() etc to major() etc
This allows for larger device number if glibc supports
it (requires 2.3.3).
Also fail before creating larger device number if glibc
support isn't present.
Signed-off-by: Neil Brown <neilb@cse.unsw.edu.au>
Diffstat (limited to 'Monitor.c')
| -rw-r--r-- | Monitor.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -246,10 +246,10 @@ int Monitor(mddev_dev_t devlist, struct stat stb; if (fstat(fd, &stb) == 0 && (S_IFMT&stb.st_mode)==S_IFBLK) { - if (MAJOR(stb.st_rdev) == MD_MAJOR) - st->devnum = MINOR(stb.st_rdev); + if (major(stb.st_rdev) == MD_MAJOR) + st->devnum = minor(stb.st_rdev); else - st->devnum = -1- (MINOR(stb.st_rdev)>>6); + st->devnum = -1- (minor(stb.st_rdev)>>6); } } @@ -323,7 +323,7 @@ int Monitor(mddev_dev_t devlist, alert("Fail", dev, dv, mailaddr, alert_cmd); else if (i >= (unsigned)array.raid_disks && (disc.major || disc.minor) && - st->devid[i] == MKDEV(disc.major, disc.minor) && + st->devid[i] == makedev(disc.major, disc.minor) && ((newstate&change)&(1<<MD_DISK_FAULTY)) ) alert("FailSpare", dev, dv, mailaddr, alert_cmd); @@ -335,7 +335,7 @@ int Monitor(mddev_dev_t devlist, alert("SpareActive", dev, dv, mailaddr, alert_cmd); } st->devstate[i] = disc.state; - st->devid[i] = MKDEV(disc.major, disc.minor); + st->devid[i] = makedev(disc.major, disc.minor); } close(fd); st->active = array.active_disks; |