- 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 996b737..ece31a7 100644 (file)
--- 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)