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 --- Grow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Grow.c') diff --git a/Grow.c b/Grow.c index 82283bc..3f8a1c6 100644 --- a/Grow.c +++ b/Grow.c @@ -109,8 +109,8 @@ int Grow_Add_device(char *devname, int fd, char *newdev) memset(&super.disks[d], 0, sizeof(super.disks[d])); super.disks[d].number = d; - super.disks[d].major = MAJOR(stb.st_rdev); - super.disks[d].minor = MINOR(stb.st_rdev); + super.disks[d].major = major(stb.st_rdev); + super.disks[d].minor = minor(stb.st_rdev); super.disks[d].raid_disk = d; super.disks[d].state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE); @@ -122,8 +122,8 @@ int Grow_Add_device(char *devname, int fd, char *newdev) return 1; } disk.number = d; - disk.major = MAJOR(stb.st_rdev); - disk.minor = MINOR(stb.st_rdev); + disk.major = major(stb.st_rdev); + disk.minor = minor(stb.st_rdev); disk.raid_disk = d; disk.state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE); close(nfd); @@ -173,8 +173,8 @@ int Grow_Add_device(char *devname, int fd, char *newdev) super.working_disks = nd+1; memset(&super.disks[nd], 0, sizeof(super.disks[nd])); super.disks[nd].number = nd; - super.disks[nd].major = MAJOR(stb.st_rdev); - super.disks[nd].minor = MINOR(stb.st_rdev); + super.disks[nd].major = major(stb.st_rdev); + super.disks[nd].minor = minor(stb.st_rdev); super.disks[nd].raid_disk = nd; super.disks[nd].state = (1 << MD_DISK_SYNC) | (1 << MD_DISK_ACTIVE); -- cgit