From 0df46c2ad8872a9d6e5832f3098d12a7e0d2eb01 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Mon, 4 Apr 2005 05:16:13 +0000 Subject: 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 --- Detail.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Detail.c') 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"); } -- cgit