d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use MAXMINOR

Browse Source
This commit is contained in:
phk 2005-01-29 16:50:04 +00:00
parent 1a5ece93a1
commit 237e3ac2e9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/dev/md/md.c
View File

@ -1183,7 +1183,7 @@ g_md_init(struct g_class *mp __unused)
MD_NAME, mdunits, name, len, ptr);
md_preloaded(ptr, len);
}
status_dev = make_dev(&mdctl_cdevsw, 0xffff00ff, UID_ROOT, GID_WHEEL,
status_dev = make_dev(&mdctl_cdevsw, MAXMINOR, UID_ROOT, GID_WHEEL,
0600, MDCTL_NAME);
g_topology_lock();
}

10
sys/kern/kern_conf.c
View File

@ -252,7 +252,7 @@ minor(struct cdev *x)
{
if (x == NULL)
return NODEV;
return(x->si_udev & 0xffff00ff);
return(x->si_udev & MAXMINOR);
}
int
@ -268,7 +268,7 @@ int
minor2unit(int _minor)
{
KASSERT((_minor & 0xff00) == 0, ("Illegal minor %x", _minor));
KASSERT((_minor & ~MAXMINOR) == 0, ("Illegal minor %x", _minor));
return ((_minor & 0xff) | (_minor >> 8));
}
@ -351,13 +351,13 @@ findcdev(dev_t udev)
int
uminor(dev_t dev)
{
return (dev & 0xffff00ff);
return (dev & MAXMINOR);
}
int
umajor(dev_t dev)
{
return ((dev & 0xff00) >> 8);
return ((dev & ~MAXMINOR) >> 8);
}
static void
@ -455,7 +455,7 @@ make_dev(struct cdevsw *devsw, int minornr, uid_t uid, gid_t gid, int perms, con
va_list ap;
int i;
KASSERT((minornr & ~0xffff00ff) == 0,
KASSERT((minornr & ~MAXMINOR) == 0,
("Invalid minor (0x%x) in make_dev", minornr));
if (!(devsw->d_flags & D_INIT))