From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Mon, 8 Nov 2004 16:18:55 +0000 (+0000)
Subject: - merge 1.10
X-Git-Tag: after-CAN_2004_1016_1017_1068-merge~26
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=64c4bb7324c76ebd0dcf9cf11718c81c75d2edc9;p=linux-2.6.git

- merge 1.10
- PL292: bump RLIMIT_NOFILE (a.k.a. INR_OPEN) to 4096 from 1024
---

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 996b7378e..ece31a727 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -42,7 +42,7 @@ struct vfsmount;
 /* Fixed constants first: */
 #undef NR_OPEN
 #define NR_OPEN (1024*1024)	/* Absolute upper limit on fd num */
-#define INR_OPEN 1024		/* Initial setting for nfile rlimits */
+#define INR_OPEN 4096		/* Initial setting for nfile rlimits */
 
 #define BLOCK_SIZE_BITS 10
 #define BLOCK_SIZE (1<<BLOCK_SIZE_BITS)