diff options
Diffstat (limited to 'sys/ufs/mfs')
| -rw-r--r-- | sys/ufs/mfs/mfs_vfsops.c | 14 | ||||
| -rw-r--r-- | sys/ufs/mfs/mfsiom.h | 43 |
2 files changed, 45 insertions, 12 deletions
diff --git a/sys/ufs/mfs/mfs_vfsops.c b/sys/ufs/mfs/mfs_vfsops.c index 1ea0804e1b0d1..01bf24d0e9f3c 100644 --- a/sys/ufs/mfs/mfs_vfsops.c +++ b/sys/ufs/mfs/mfs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mfs_vfsops.c 8.11 (Berkeley) 6/19/95 - * $Id: mfs_vfsops.c,v 1.52 1998/12/07 21:58:49 archie Exp $ + * $Id: mfs_vfsops.c,v 1.50 1998/10/10 08:12:24 jkh Exp $ */ @@ -103,7 +103,7 @@ VFS_SET(mfs_vfsops, mfs, 0); #ifdef MFS_ROOT_SIZE /* Image was already written into mfs_root */ static u_char mfs_root[MFS_ROOT_SIZE*1024] = "MFS Filesystem goes here"; -static u_char end_mfs_root[] __unused = "MFS Filesystem had better STOP here"; +static u_char end_mfs_root[] = "MFS Filesystem had better STOP here"; #endif u_char * @@ -391,16 +391,6 @@ mfs_start(mp, flags, p) register int gotsig = 0; base = mfsp->mfs_baseoff; - - /* - * Must set P_SYSTEM to prevent system from trying to kill - * this process. What happens is that the process is unkillable, - * and the swapper loops trying to continuously kill it. Nor - * can we swap out this process - not unless you want a deadlock, - * anyway. - */ - curproc->p_flag |= P_SYSTEM; - while (mfsp->mfs_active) { while (bp = bufq_first(&mfsp->buf_queue)) { bufq_remove(&mfsp->buf_queue, bp); diff --git a/sys/ufs/mfs/mfsiom.h b/sys/ufs/mfs/mfsiom.h new file mode 100644 index 0000000000000..d0a0b608a2783 --- /dev/null +++ b/sys/ufs/mfs/mfsiom.h @@ -0,0 +1,43 @@ +/* + * Copyright (c) 1989, 1993 + * The Regents of the University of California. All rights reserved. + * + * 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS 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. + * + * @(#)mfsiom.h 8.1 (Berkeley) 6/11/93 + * $Id$ + */ + +#ifndef _UFS_MFS_MFSIOM_H_ +#define _UFS_MFS_MFSIOM_H_ + +#define MFS_MAPREG (MAXPHYS/PAGE_SIZE + 2) /* Kernel mapping pte's */ +#define MFS_MAPSIZE 10 /* Size of alloc map for pte's */ + +#endif |