summaryrefslogtreecommitdiffstats
path: root/Detail.c
diff options
context:
space:
mode:
authorNeil Brown <neilb@suse.de>2005-04-04 05:16:13 +0000
committerNeil Brown <neilb@suse.de>2005-04-04 05:16:13 +0000
commit0df46c2ad8872a9d6e5832f3098d12a7e0d2eb01 (patch)
treeb328e05ae148e9d2627a4a9e62c1b6a705136c03 /Detail.c
parent8d80900b492998a112eda80614a793012bee2770 (diff)
downloadmdadm-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 'Detail.c')
-rw-r--r--Detail.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Detail.c b/Detail.c
index c8992cc..7555a9a 100644
--- a/Detail.c
+++ b/Detail.c
@@ -124,7 +124,7 @@ int Detail(char *dev, int brief, int test)
struct mdstat_ent *ms = mdstat_read(0);
struct mdstat_ent *e;
int devnum = array.md_minor;
- if (MAJOR(stb.st_rdev) != MD_MAJOR)
+ if (major(stb.st_rdev) != MD_MAJOR)
devnum = -1 - devnum;
for (e=ms; e; e=e->next)
@@ -251,8 +251,8 @@ int Detail(char *dev, int brief, int test)
* device from the array, and then put it back.
* If this fails, we are rebuilding
*/
- int err = ioctl(fd, HOT_REMOVE_DISK, MKDEV(disk.major, disk.minor));
- if (err == 0) ioctl(fd, HOT_ADD_DISK, MKDEV(disk.major, disk.minor));
+ int err = ioctl(fd, HOT_REMOVE_DISK, makedev(disk.major, disk.minor));
+ if (err == 0) ioctl(fd, HOT_ADD_DISK, makedev(disk.major, disk.minor));
if (err && errno == EBUSY)
printf(" rebuilding");
}