diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1996-03-27 18:50:10 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1996-03-27 18:50:10 +0000 |
| commit | 6ae323519c4584c7228cafcba56a96aaf78f8b0a (patch) | |
| tree | f9c3f8c23a6c10cff1491ff0a22678a78ee71464 /sys/kern/subr_diskslice.c | |
| parent | a5e1a0f2e956402fae32b621f999bc3730fe7b25 (diff) | |
Notes
Diffstat (limited to 'sys/kern/subr_diskslice.c')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index fff69fccbcf6..01d42082ac44 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.18 1996/01/27 09:34:21 bde Exp $ + * $Id: subr_diskslice.c,v 1.19 1996/01/28 08:15:44 bde Exp $ */ #include <sys/param.h> @@ -574,9 +574,6 @@ dsopen(dname, dev, mode, sspp, lp, strat, setgeom, bdevsw, cdevsw) struct bdevsw *bdevsw; struct cdevsw *cdevsw; { -#ifdef DEVFS - char devname[64]; -#endif int error; struct disklabel *lp1; char *msg; @@ -660,12 +657,13 @@ dsopen(dname, dev, mode, sspp, lp, strat, setgeom, bdevsw, cdevsw) #ifdef DEVFS if (slice >= BASE_SLICE && sp->ds_bdev == NULL && sp->ds_size != 0) { mynor = minor(dkmodpart(dev, RAW_PART)); - sprintf(devname, "r%s", - dsname(dname, unit, slice, RAW_PART, partname)); - sp->ds_bdev = devfs_add_devsw("/", devname + 1, bdevsw, - mynor, DV_BLK, 0, 0, 0640); - sp->ds_cdev = devfs_add_devsw("/", devname, cdevsw, - mynor, DV_CHR, 0, 0, 0640); + sname = dsname(dname, unit, slice, RAW_PART, partname); + sp->ds_bdev = devfs_add_devswf(bdevsw, mynor, DV_BLK, + UID_ROOT, GID_OPERATOR, 0640, + "%s", sname); + sp->ds_cdev = devfs_add_devswf(cdevsw, mynor, DV_CHR, + UID_ROOT, GID_OPERATOR, 0640, + "r%s", sname); } #endif if (sp->ds_label == NULL) { @@ -970,11 +968,13 @@ set_ds_labeldevs(dname, dev, ssp) } else { mynor = minor(dkmodpart(dev, part)); sp->ds_bdevs[part] = - devfs_add_devsw("/", devname+1, ssp->dss_bdevsw, - mynor, DV_BLK, 0, 0, 0640); + devfs_add_devswf(ssp->dss_bdevsw, mynor, DV_BLK, + UID_ROOT, GID_OPERATOR, 0640, + "%s", devname + 1); sp->ds_cdevs[part] = - devfs_add_devsw("/", devname, ssp->dss_cdevsw, - mynor, DV_CHR, 0, 0, 0640); + devfs_add_devswf(ssp->dss_cdevsw, mynor, DV_CHR, + UID_ROOT, GID_OPERATOR, 0640, + "%s", devname); } } } |