diff options
author | rwatson <rwatson@FreeBSD.org> | 2003-10-02 03:57:59 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2003-10-02 03:57:59 +0000 |
commit | 1c522512fd8b855dc3d6dbd26fed59bda6e9f0e4 (patch) | |
tree | 7fdb21bc021ffa96a9ec8e2fef64117bb2d7f8f7 | |
parent | bde7cb88e1541224eebdf2697d051304801b7d90 (diff) | |
download | FreeBSD-src-1c522512fd8b855dc3d6dbd26fed59bda6e9f0e4.zip FreeBSD-src-1c522512fd8b855dc3d6dbd26fed59bda6e9f0e4.tar.gz |
Remove the global variable 'cmask', which was used to initialize the
fd_cmask field in the file descriptor structure for the first process
indirectly from CMASK, and when an fd structure is initialized before
being filled in, and instead just use CMASK. This appears to be an
artifact left over from the initial integration of quotas into BSD.
Suggested by: peter
-rw-r--r-- | sys/kern/init_main.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_descrip.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index bff07b1..f87137d 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -97,8 +97,6 @@ static struct plimit limit0; struct vmspace vmspace0; struct proc *initproc; -int cmask = CMASK; - struct vnode *rootvp; int boothowto = 0; /* initialized so that it can be patched */ SYSCTL_INT(_debug, OID_AUTO, boothowto, CTLFLAG_RD, &boothowto, 0, ""); @@ -413,7 +411,7 @@ proc0_init(void *dummy __unused) p->p_fdtol = NULL; mtx_init(&fdp->fd_fd.fd_mtx, FILEDESC_LOCK_DESC, NULL, MTX_DEF); fdp->fd_fd.fd_refcnt = 1; - fdp->fd_fd.fd_cmask = cmask; + fdp->fd_fd.fd_cmask = CMASK; fdp->fd_fd.fd_ofiles = fdp->fd_dfiles; fdp->fd_fd.fd_ofileflags = fdp->fd_dfileflags; fdp->fd_fd.fd_nfiles = NDFILE; diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index c2a6eea..1ed5140 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -102,7 +102,6 @@ static int do_dup(struct thread *td, enum dup_type type, int old, int new, */ struct filelist filehead; /* head of list of open files */ int nfiles; /* actual number of open files */ -extern int cmask; struct sx filelist_lock; /* sx to protect filelist */ struct mtx sigio_lock; /* mtx to protect pointers to sigio */ @@ -1264,7 +1263,7 @@ fdinit(fdp) /* Create the file descriptor table. */ newfdp->fd_fd.fd_refcnt = 1; - newfdp->fd_fd.fd_cmask = cmask; + newfdp->fd_fd.fd_cmask = CMASK; newfdp->fd_fd.fd_ofiles = newfdp->fd_dfiles; newfdp->fd_fd.fd_ofileflags = newfdp->fd_dfileflags; newfdp->fd_fd.fd_nfiles = NDFILE; |