diff options
author | julian <julian@FreeBSD.org> | 1998-04-24 07:54:00 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 1998-04-24 07:54:00 +0000 |
commit | de78d409f5c0e756bc89d1d84f959c79752b22a1 (patch) | |
tree | 532a4c3a976b975c6100f5cff82f840091af369a /sys | |
parent | aedfea1af81dbce4903bc916468988620f4c150d (diff) | |
download | FreeBSD-src-de78d409f5c0e756bc89d1d84f959c79752b22a1.zip FreeBSD-src-de78d409f5c0e756bc89d1d84f959c79752b22a1.tar.gz |
slice_device.c: permissions changes for SLICE devices
vn.c: change time of SYSINIT scheduling.
wd.c don't revert to fully closed state. ( may require more)
all in SLICE mode only.
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/slice/slice_device.c | 6 | ||||
-rw-r--r-- | sys/dev/vn/vn.c | 5 | ||||
-rw-r--r-- | sys/i386/isa/wd.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/sys/dev/slice/slice_device.c b/sys/dev/slice/slice_device.c index 30bb309..d471bd4 100644 --- a/sys/dev/slice/slice_device.c +++ b/sys/dev/slice/slice_device.c @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: slice_device.c,v 1.2 1998/04/22 10:25:10 julian Exp $ + * $Id: slice_device.c,v 1.3 1998/04/22 19:27:52 julian Exp $ */ #define DIAGNOSTIC 1 @@ -115,9 +115,9 @@ RR; * Add an entry in the devfs for it. Possibly should happen later. */ slice->devfs_ctoken = devfs_add_devswf(&slice_cdevsw, unit, DV_CHR, - UID_ROOT, GID_KMEM, 0600, "r%s", name ? name : "-"); + UID_ROOT, GID_OPERATOR, 0600, "r%s", name ? name : "-"); slice->devfs_btoken = devfs_add_devswf(&slice_bdevsw, unit, DV_BLK, - UID_ROOT, GID_KMEM, 0600, "%s", name ? name : "-"); + UID_ROOT, GID_OPERATOR, 0600, "%s", name ? name : "-"); /* XXX link this node into upper list of caller */ } diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index 7c6d425..0ee8871 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id: vn.c,v 1.56 1998/04/19 23:31:21 julian Exp $ + * $Id: vn.c,v 1.57 1998/04/22 10:25:12 julian Exp $ */ /* @@ -892,11 +892,10 @@ vn_drvinit(void *unused) vn->slice->probeinfo.typespecific = NULL; vn->slice->probeinfo.type = NULL; } -#define CDEV_MAJOR 20 /* not really needed */ #endif /* SLICE */ } -SYSINIT(vndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,vn_drvinit,NULL) +SYSINIT(vndev, SI_SUB_DRIVERS, SI_ORDER_ANY, vn_drvinit, NULL) #ifdef SLICE diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index bc21af7..e95b7d7 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.161 1998/04/22 19:27:53 julian Exp $ + * $Id: wd.c,v 1.162 1998/04/23 22:09:55 julian Exp $ */ /* TODO: @@ -2716,7 +2716,9 @@ wdsopen(void *private, int flags, int mode, struct proc *p) du->dk_state = OPEN; du->dk_flags &= ~DKFL_BADSCAN; } else { - du->dk_state = CLOSED; + /* <luoqi@watermarkgroup.com> suggests I remove this */ + /* du->dk_state = CLOSED;*/ + /* du->dk_state = WANTOPEN; */ /* maybe this? */ } return (error); } |