Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / Documentation / sysctl / fs.txt

diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index 5c3a51905969cabc9ef7d1f26178aadbb476d612..f99254327ae59b59971d979b38cc083d3ac096e5 100644 (file)
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -23,6 +23,7 @@ Currently, these files are in /proc/sys/fs:
 - inode-max
 - inode-nr
 - inode-state
 - inode-max
 - inode-nr
 - inode-state

+- nr_open

 - overflowuid
 - overflowgid
 - suid_dumpable
 - overflowuid
 - overflowgid
 - suid_dumpable


@@ -91,6 +92,15 @@ usage of file handles and you don't need to increase the maximum.
 
 ==============================================================
 
 
 ==============================================================
 

+nr_open:
+
+This denotes the maximum number of file-handles a process can
+allocate. Default value is 1024*1024 (1048576) which should be
+enough for most machines. Actual limit depends on RLIMIT_NOFILE
+resource limit.
+
+==============================================================
+

 inode-max, inode-nr & inode-state:
 
 As with file handles, the kernel allocates the inode structures
 inode-max, inode-nr & inode-state:
 
 As with file handles, the kernel allocates the inode structures


@@ -146,7 +156,7 @@ or otherwise protected/tainted binaries. The modes are
        readable by root only. This allows the end user to remove
        such a dump but not access it directly. For security reasons
        core dumps in this mode will not overwrite one another or
        readable by root only. This allows the end user to remove
        such a dump but not access it directly. For security reasons
        core dumps in this mode will not overwrite one another or

-       other files. This mode is appropriate when adminstrators are
+       other files. This mode is appropriate when administrators are

        attempting to debug problems in a normal environment.
 
 ==============================================================
        attempting to debug problems in a normal environment.
 
 ==============================================================