Use dev_t for devnm2devid and devid2devnm
Commit 4dd2df0966
added a trip through makedev(), major(), and minor() for
device major and minor numbers. This would cause mdadm to fail in operating
on a device with a minor number bigger than (2^19)-1 due to it changing
from dev_t to a signed int and back.
Where this was found as a problem was when a array was created with a device
specified as a name like /dev/md/raidname and there were already 128 arrays
on the system. In this case, mdadm would chose 1048575 ((2^20)-1) for the
array and minor number. This would cause the major and minor number to become
negative when generated from devnm2devid() and passed to major() and minor()
in open_dev_excl(). open_dev_excl() would then call dev_open() which would
detect the negative minor number and call open() on the *char containing the
major:minor pair which isn't a valid file.
Signed-off-by: Mike Lovell <mlovell@bluehost.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
parent
df2647fa5b
commit
13db17bd1f
4
Detail.c
4
Detail.c
|
@ -130,7 +130,7 @@ int Detail(char *dev, struct context *c)
|
|||
/* This is a subarray of some container.
|
||||
* We want the name of the container, and the member
|
||||
*/
|
||||
int devid = devnm2devid(st->container_devnm);
|
||||
dev_t devid = devnm2devid(st->container_devnm);
|
||||
int cfd, err;
|
||||
|
||||
member = subarray;
|
||||
|
@ -577,7 +577,7 @@ This is pretty boring
|
|||
char path[200];
|
||||
char vbuf[1024];
|
||||
int nlen = strlen(sra->sys_name);
|
||||
int devid;
|
||||
dev_t devid;
|
||||
if (de->d_name[0] == '.')
|
||||
continue;
|
||||
sprintf(path, "/sys/block/%s/md/metadata_version",
|
||||
|
|
2
Grow.c
2
Grow.c
|
@ -3533,7 +3533,7 @@ int reshape_container(char *container, char *devname,
|
|||
int fd;
|
||||
struct mdstat_ent *mdstat;
|
||||
char *adev;
|
||||
int devid;
|
||||
dev_t devid;
|
||||
|
||||
sysfs_free(cc);
|
||||
|
||||
|
|
2
lib.c
2
lib.c
|
@ -99,7 +99,7 @@ char *fd2kname(int fd)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
char *devid2devnm(int devid)
|
||||
char *devid2devnm(dev_t devid)
|
||||
{
|
||||
char path[30];
|
||||
char link[200];
|
||||
|
|
|
@ -374,7 +374,7 @@ void RebuildMap(void)
|
|||
char dn[30];
|
||||
int dfd;
|
||||
int ok;
|
||||
int devid;
|
||||
dev_t devid;
|
||||
struct supertype *st;
|
||||
char *subarray = NULL;
|
||||
char *path;
|
||||
|
|
4
mdadm.h
4
mdadm.h
|
@ -1440,8 +1440,8 @@ extern char *find_free_devnm(int use_partitions);
|
|||
|
||||
extern void put_md_name(char *name);
|
||||
extern char *devid2kname(int devid);
|
||||
extern char *devid2devnm(int devid);
|
||||
extern int devnm2devid(char *devnm);
|
||||
extern char *devid2devnm(dev_t devid);
|
||||
extern dev_t devnm2devid(char *devnm);
|
||||
extern char *get_md_name(char *devnm);
|
||||
|
||||
extern char DefaultConfFile[];
|
||||
|
|
4
mdopen.c
4
mdopen.c
|
@ -348,7 +348,7 @@ int create_mddev(char *dev, char *name, int autof, int trustworthy,
|
|||
if (lstat(devname, &stb) == 0) {
|
||||
/* Must be the correct device, else error */
|
||||
if ((stb.st_mode&S_IFMT) != S_IFBLK ||
|
||||
stb.st_rdev != (dev_t)devnm2devid(devnm)) {
|
||||
stb.st_rdev != devnm2devid(devnm)) {
|
||||
pr_err("%s exists but looks wrong, please fix\n",
|
||||
devname);
|
||||
return -1;
|
||||
|
@ -452,7 +452,7 @@ char *find_free_devnm(int use_partitions)
|
|||
if (!use_udev()) {
|
||||
/* make sure it is new to /dev too, at least as a
|
||||
* non-standard */
|
||||
int devid = devnm2devid(devnm);
|
||||
dev_t devid = devnm2devid(devnm);
|
||||
if (devid) {
|
||||
char *dn = map_dev(major(devid),
|
||||
minor(devid), 0);
|
||||
|
|
6
util.c
6
util.c
|
@ -928,7 +928,7 @@ int get_data_disks(int level, int layout, int raid_disks)
|
|||
return data_disks;
|
||||
}
|
||||
|
||||
int devnm2devid(char *devnm)
|
||||
dev_t devnm2devid(char *devnm)
|
||||
{
|
||||
/* First look in /sys/block/$DEVNM/dev for %d:%d
|
||||
* If that fails, try parsing out a number
|
||||
|
@ -1065,7 +1065,7 @@ int dev_open(char *dev, int flags)
|
|||
|
||||
int open_dev_flags(char *devnm, int flags)
|
||||
{
|
||||
int devid;
|
||||
dev_t devid;
|
||||
char buf[20];
|
||||
|
||||
devid = devnm2devid(devnm);
|
||||
|
@ -1083,7 +1083,7 @@ int open_dev_excl(char *devnm)
|
|||
char buf[20];
|
||||
int i;
|
||||
int flags = O_RDWR;
|
||||
int devid = devnm2devid(devnm);
|
||||
dev_t devid = devnm2devid(devnm);
|
||||
long delay = 1000;
|
||||
|
||||
sprintf(buf, "%d:%d", major(devid), minor(devid));
|
||||
|
|
Loading…
Reference in New Issue