summaryrefslogtreecommitdiffstats
path: root/sys/cddl
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2008-09-27 08:51:18 +0000
committered <ed@FreeBSD.org>2008-09-27 08:51:18 +0000
commit4efdef565f9a0ca3468534f97c6ac4aaaf747c9a (patch)
treedd0035910760a440d495b23940f57a42ed24ca85 /sys/cddl
parentd720932e5974ce75bf983cc61010a6eb70f94b86 (diff)
downloadFreeBSD-src-4efdef565f9a0ca3468534f97c6ac4aaaf747c9a.zip
FreeBSD-src-4efdef565f9a0ca3468534f97c6ac4aaaf747c9a.tar.gz
Replace all calls to minor() with dev2unit().
After I removed all the unit2minor()/minor2unit() calls from the kernel yesterday, I realised calling minor() everywhere is quite confusing. Character devices now only have the ability to store a unit number, not a minor number. Remove the confusion by using dev2unit() everywhere. This commit could also be considered as a bug fix. A lot of drivers call minor(), while they should actually be calling dev2unit(). In -CURRENT this isn't a problem, but it turns out we never had any problem reports related to that issue in the past. I suspect not many people connect more than 256 pieces of the same hardware. Reviewed by: kib
Diffstat (limited to 'sys/cddl')
-rw-r--r--sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index 2afc602..847a1ba 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -12816,7 +12816,7 @@ dtrace_state_create(struct cdev *dev)
#else
if (dev != NULL) {
cr = dev->si_cred;
- m = minor(dev);
+ m = dev2unit(dev);
}
/* Allocate memory for the state. */
@@ -15266,7 +15266,7 @@ dtrace_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
* The first minor device is the one that is cloned so there is
* nothing more to do here.
*/
- if (minor(dev) == 0)
+ if (dev2unit(dev) == 0)
return 0;
/*
@@ -15367,7 +15367,7 @@ dtrace_close(struct cdev *dev, int flags, int fmt __unused, struct thread *td)
dtrace_state_t *state = dev->si_drv1;
/* Check if this is not a cloned device. */
- if (minor(dev) == 0)
+ if (dev2unit(dev) == 0)
return (0);
#endif
OpenPOWER on IntegriCloud