RLIMIT_OFILE --> RLIMIT_NOFILE
This commit is contained in:
parent
7a19417ff8
commit
742dcd5655
@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
/*static char sccsid[] = "from: @(#)func.c 5.20 (Berkeley) 6/27/91";*/
|
/*static char sccsid[] = "from: @(#)func.c 5.20 (Berkeley) 6/27/91";*/
|
||||||
static char rcsid[] = "$Id: func.c,v 1.4 1993/08/01 19:00:43 mycroft Exp $";
|
static char rcsid[] = "$Id: func.c,v 1.5 1993/08/23 16:04:39 mycroft Exp $";
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -1045,7 +1045,7 @@ static struct limits {
|
|||||||
RLIMIT_RSS, "memoryuse", 1024, "kbytes",
|
RLIMIT_RSS, "memoryuse", 1024, "kbytes",
|
||||||
RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes",
|
RLIMIT_MEMLOCK, "memorylocked", 1024, "kbytes",
|
||||||
RLIMIT_NPROC, "maxproc", 1, "",
|
RLIMIT_NPROC, "maxproc", 1, "",
|
||||||
RLIMIT_OFILE, "openfiles", 1, "",
|
RLIMIT_NOFILE, "openfiles", 1, "",
|
||||||
-1, NULL, 0, NULL
|
-1, NULL, 0, NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1 +1 @@
|
|||||||
revision 1.22 intentionally removed
|
revision 1.23 intentionally removed
|
||||||
|
@ -1 +1 @@
|
|||||||
revision 1.7 intentionally removed
|
revision 1.8 intentionally removed
|
||||||
|
@ -1 +1 @@
|
|||||||
revision 1.7 intentionally removed
|
revision 1.8 intentionally removed
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: fdesc_vfsops.c,v 1.4 1993/06/07 05:25:20 cgd Exp $
|
* $Id: fdesc_vfsops.c,v 1.5 1993/08/23 16:02:46 mycroft Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -236,7 +236,7 @@ fdesc_statfs(mp, sbp, p)
|
|||||||
* limit is ever reduced below the current number
|
* limit is ever reduced below the current number
|
||||||
* of open files... ]
|
* of open files... ]
|
||||||
*/
|
*/
|
||||||
lim = p->p_rlimit[RLIMIT_OFILE].rlim_cur;
|
lim = p->p_rlimit[RLIMIT_NOFILE].rlim_cur;
|
||||||
fdp = p->p_fd;
|
fdp = p->p_fd;
|
||||||
last = min(fdp->fd_nfiles, lim);
|
last = min(fdp->fd_nfiles, lim);
|
||||||
freefd = 0;
|
freefd = 0;
|
||||||
|
@ -31,7 +31,7 @@
|
|||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* from: @(#)resource.h 7.5 (Berkeley) 3/17/91
|
* from: @(#)resource.h 7.5 (Berkeley) 3/17/91
|
||||||
* $Id: resource.h,v 1.3 1993/05/20 16:22:57 cgd Exp $
|
* $Id: resource.h,v 1.4 1993/08/23 16:01:56 mycroft Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _SYS_RESOURCE_H_
|
#ifndef _SYS_RESOURCE_H_
|
||||||
@ -86,7 +86,7 @@ struct rusage {
|
|||||||
#define RLIMIT_RSS 5 /* resident set size */
|
#define RLIMIT_RSS 5 /* resident set size */
|
||||||
#define RLIMIT_MEMLOCK 6 /* locked-in-memory address space */
|
#define RLIMIT_MEMLOCK 6 /* locked-in-memory address space */
|
||||||
#define RLIMIT_NPROC 7 /* number of processes */
|
#define RLIMIT_NPROC 7 /* number of processes */
|
||||||
#define RLIMIT_OFILE 8 /* number of open files */
|
#define RLIMIT_NOFILE 8 /* number of open files */
|
||||||
|
|
||||||
#define RLIM_NLIMITS 9 /* number of resource limits */
|
#define RLIM_NLIMITS 9 /* number of resource limits */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user