date and time created 90/02/07 19:18:39 by mckusick

[unix-history] / usr / src / sys / conf / param.c

diff --git a/usr/src/sys/conf/param.c b/usr/src/sys/conf/param.c
index 06f5a51..af417d2 100644 (file)
--- a/usr/src/sys/conf/param.c
+++ b/usr/src/sys/conf/param.c
@@ -1,32 +1,42 @@
 /*
 /*

- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1980, 1986, 1989 Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)param.c     6.13 (Berkeley) %G%
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ *     @(#)param.c     7.8 (Berkeley) %G%

  */
 
 #ifndef lint
 char copyright[] =
  */
 
 #ifndef lint
 char copyright[] =

-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
+"@(#) Copyright (c) 1980, 1986, 1989 Regents of the University of California.\n\

  All rights reserved.\n";
 #endif not lint
 
  All rights reserved.\n";
 #endif not lint
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/socket.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/text.h"
-#include "../h/inode.h"
-#include "../h/file.h"
-#include "../h/callout.h"
-#include "../h/clist.h"
-#include "../h/cmap.h"
-#include "../h/mbuf.h"
-#include "../h/quota.h"
-#include "../h/kernel.h"
+#include "../sys/param.h"
+#include "../sys/systm.h"
+#include "../sys/socket.h"
+#include "../sys/user.h"
+#include "../sys/proc.h"
+#include "../sys/text.h"
+#include "../sys/vnode.h"
+#include "../sys/file.h"
+#include "../sys/callout.h"
+#include "../sys/clist.h"
+#include "../sys/cmap.h"
+#include "../sys/mbuf.h"
+#include "../ufs/quota.h"
+#include "../sys/kernel.h"

 /*
  * System parameter formulae.
  *
 /*
  * System parameter formulae.
  *


@@ -37,7 +47,9 @@ char copyright[] =
  * Compiled with -DHZ=xx -DTIMEZONE=x -DDST=x -DMAXUSERS=xx
  */
 
  * Compiled with -DHZ=xx -DTIMEZONE=x -DDST=x -DMAXUSERS=xx
  */
 

+#ifndef HZ

 #define        HZ 100
 #define        HZ 100

+#endif

 int    hz = HZ;
 int    tick = 1000000 / HZ;
 int    tickadj = 240000 / (60 * HZ);           /* can adjust 240ms in 60s */
 int    hz = HZ;
 int    tick = 1000000 / HZ;
 int    tickadj = 240000 / (60 * HZ);           /* can adjust 240ms in 60s */


@@ -45,17 +57,18 @@ struct      timezone tz = { TIMEZONE, DST };
 #define        NPROC (20 + 8 * MAXUSERS)
 int    nproc = NPROC;
 int    ntext = 36 + MAXUSERS;
 #define        NPROC (20 + 8 * MAXUSERS)
 int    nproc = NPROC;
 int    ntext = 36 + MAXUSERS;

-#define NINODE ((NPROC + 16 + MAXUSERS) + 32)
-int    ninode = NINODE;
-int    nchsize = NINODE * 11 / 10;
+#define NVNODE ((NPROC + 16 + MAXUSERS) + 32)
+int    nvnode = NVNODE;
+int    nchsize = NVNODE * 11 / 10;

 int    nfile = 16 * (NPROC + 16 + MAXUSERS) / 10 + 32;
 int    ncallout = 16 + NPROC;
 int    nclist = 60 + 12 * MAXUSERS;
 int     nmbclusters = NMBCLUSTERS;
 #ifdef QUOTA
 int    nquota = (MAXUSERS * 9) / 7 + 3;
 int    nfile = 16 * (NPROC + 16 + MAXUSERS) / 10 + 32;
 int    ncallout = 16 + NPROC;
 int    nclist = 60 + 12 * MAXUSERS;
 int     nmbclusters = NMBCLUSTERS;
 #ifdef QUOTA
 int    nquota = (MAXUSERS * 9) / 7 + 3;

-int    ndquot = NINODE + (MAXUSERS * NMOUNT) / 4;
+int    ndquot = NVNODE + (MAXUSERS * NMOUNT) / 4;

 #endif
 #endif

+int    fscale = FSCALE;        /* kernel uses `FSCALE', user uses `fscale' */

 
 /*
  * These are initialized at bootstrap time
 
 /*
  * These are initialized at bootstrap time


@@ -70,7 +83,7 @@ int   nbuf, nswbuf;
  */
 struct proc *proc, *procNPROC;
 struct text *text, *textNTEXT;
  */
 struct proc *proc, *procNPROC;
 struct text *text, *textNTEXT;

-struct inode *inode, *inodeNINODE;
+struct vnode *vnode, *vnodeNVNODE;

 struct file *file, *fileNFILE;
 struct         callout *callout;
 struct cblock *cfree;
 struct file *file, *fileNFILE;
 struct         callout *callout;
 struct cblock *cfree;