Make the devfs SLICE option a standard type option.

(hopefully it will go away eventually anyhow)
This commit is contained in:
Julian Elischer 1998-04-20 03:57:41 +00:00
parent 53b8d408ff
commit c0bab11dfe
10 changed files with 53 additions and 18 deletions

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.92 1998/03/17 00:28:02 msmith Exp $
* $Id: autoconf.c,v 1.93 1998/04/19 23:31:33 julian Exp $
*/
/*
@ -45,6 +45,7 @@
* devices are determined (from possibilities mentioned in ioconf.c),
* and the drivers are initialized.
*/
#include "opt_devfs.h" /* for SLICE */
#include "opt_bootp.h"
#include "opt_ffs.h"
#include "opt_cd9660.h"

View File

@ -1,4 +1,4 @@
# $Id: options,v 1.69 1998/03/21 11:33:49 peter Exp $
# $Id: options,v 1.70 1998/03/28 11:49:16 dufault Exp $
#
# On the handling of kernel options
#
@ -39,6 +39,7 @@ DDB
DDB_UNATTENDED opt_ddb.h
GDB_REMOTE_CHAT opt_ddb.h
DEVFS
SLICE opt_devfs.h
DEVFS_ROOT opt_devfs.h
FAILSAFE
HW_WDOG

View File

@ -36,9 +36,10 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
* $Id: cd9660_vfsops.c,v 1.35 1998/03/08 09:56:41 julian Exp $
* $Id: cd9660_vfsops.c,v 1.36 1998/04/19 23:31:48 julian Exp $
*/
#include "opt_devfs.h" /* for SLICE */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>

View File

@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
* $Id: autoconf.c,v 1.92 1998/03/17 00:28:02 msmith Exp $
* $Id: autoconf.c,v 1.93 1998/04/19 23:31:33 julian Exp $
*/
/*
@ -45,6 +45,7 @@
* devices are determined (from possibilities mentioned in ioconf.c),
* and the drivers are initialized.
*/
#include "opt_devfs.h" /* for SLICE */
#include "opt_bootp.h"
#include "opt_ffs.h"
#include "opt_cd9660.h"

View File

@ -36,9 +36,10 @@
* SUCH DAMAGE.
*
* @(#)cd9660_vfsops.c 8.18 (Berkeley) 5/22/95
* $Id: cd9660_vfsops.c,v 1.35 1998/03/08 09:56:41 julian Exp $
* $Id: cd9660_vfsops.c,v 1.36 1998/04/19 23:31:48 julian Exp $
*/
#include "opt_devfs.h" /* for SLICE */
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/namei.h>

View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94
* $Id: vfs_conf.c,v 1.22 1998/03/11 00:10:31 msmith Exp $
* $Id: vfs_conf.c,v 1.23 1998/04/19 23:31:57 julian Exp $
*/
/*
@ -51,6 +51,7 @@
* as an aid to conversion for kernel multithreading
* on SMP reentrancy
*/
#include "opt_devfs.h" /* for SLICE */
#include "opt_bootp.h"
#include <sys/param.h> /* dev_t (types.h)*/

View File

@ -32,7 +32,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_conf.c 8.8 (Berkeley) 3/31/94
* $Id: vfs_conf.c,v 1.22 1998/03/11 00:10:31 msmith Exp $
* $Id: vfs_conf.c,v 1.23 1998/04/19 23:31:57 julian Exp $
*/
/*
@ -51,6 +51,7 @@
* as an aid to conversion for kernel multithreading
* on SMP reentrancy
*/
#include "opt_devfs.h" /* for SLICE */
#include "opt_bootp.h"
#include <sys/param.h> /* dev_t (types.h)*/

View File

@ -24,14 +24,18 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: devfs_tree.c,v 1.51 1998/04/17 22:36:53 des Exp $
* $Id: devfs_tree.c,v 1.52 1998/04/19 23:32:09 julian Exp $
*/
#define SPLIT_DEVS 1
/*#define SPLIT_DEVS 1*/
/* SPLIT_DEVS means each devfs uses a different vnode for the same device */
/* Otherwise the same device always ends up at the same vnode even if */
/* reached througgh a different devfs instance. The practical difference */
/* is that with the same vnode, chmods and chowns show up on all instances of */
/* a device. (etc) */
#include "opt_devfs.h"
#define SPLIT_DEVS 1 /* maybe make this an option */
/*#define SPLIT_DEVS 1*/
#include <sys/param.h>
#include <sys/systm.h>

View File

@ -1,11 +1,34 @@
/* usual BSD style copyright here */
/* Written by Julian Elischer (julian@dialix.oz.au)*/
/*
* $Id: devfsext.h,v 1.16 1997/09/16 14:23:35 bde Exp $
* Copyright 1997,1998 Julian Elischer. All rights reserved.
* julian@freebsd.org
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
* met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE HOLDER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
/*
* $Id: devfsext.h,v 1.17 1998/04/19 23:32:40 julian Exp $
*/
#ifndef _SYS_DEVFSECT_H_
#define _SYS_DEVFSECT_H_
#ifndef _SYS_DEVFSEXT_H_
#define _SYS_DEVFSEXT_H_
/*
* Make a device at a path, and get a cookie for it in return.
@ -58,4 +81,4 @@ dev_t devfs_vntodev __P((struct vnode *vn)); /* extract dev_t from devfs vn */
#define GID_BIN 7
#define GID_DIALER 68
#endif /* !_SYS_DEVFSECT_H_ */
#endif /* !_SYS_DEVFSEXT_H_ */

View File

@ -31,9 +31,10 @@
* SUCH DAMAGE.
*
* @(#)ffs_vfsops.c 8.31 (Berkeley) 5/20/95
* $Id: ffs_vfsops.c,v 1.78 1998/03/30 09:56:00 phk Exp $
* $Id: ffs_vfsops.c,v 1.79 1998/04/19 23:32:49 julian Exp $
*/
#include "opt_devfs.h" /* for SLICE */
#include "opt_quota.h"
#include <sys/param.h>