From 0aabd57ba594ae4bf28bc5646321db33f9475358 Mon Sep 17 00:00:00 2001 From: Alex Hornung Date: Fri, 11 Sep 2009 07:13:27 +0100 Subject: [PATCH] disk - use make_dev_covering instead of make_dev * Switch subr_disk to use the new make_dev_covering so proper major numbers will appear. This was especially an issue because there could be major/minor collisions. Reported-By: Sascha Wildner --- sys/kern/subr_disk.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index 66c950238e..5a5822d53c 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -208,7 +208,7 @@ disk_probe_slice(struct disk *dp, cdev_t dev, int slice, int reprobe) */ ndev->si_flags |= SI_REPROBE_TEST; } else { - ndev = make_dev(&disk_ops, + ndev = make_dev_covering(&disk_ops, dp->d_rawdev, dkmakeminor(dkunit(dp->d_cdev), slice, i), UID_ROOT, GID_OPERATOR, 0640, @@ -308,7 +308,7 @@ disk_probe(struct disk *dp, int reprobe) /* * Else create new device */ - ndev = make_dev(&disk_ops, + ndev = make_dev_covering(&disk_ops, dp->d_rawdev, dkmakewholeslice(dkunit(dev), i), UID_ROOT, GID_OPERATOR, 0640, "%ss%d", dev->si_name, sno); @@ -501,7 +501,7 @@ disk_create(int unit, struct disk *dp, struct dev_ops *raw_ops) dp->d_rawdev = rawdev; dp->d_raw_ops = raw_ops; dp->d_dev_ops = &disk_ops; - dp->d_cdev = make_dev(&disk_ops, + dp->d_cdev = make_dev_covering(&disk_ops, dp->d_rawdev, dkmakewholedisk(unit), UID_ROOT, GID_OPERATOR, 0640, "%s%d", raw_ops->head.name, unit); -- 2.41.0