aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2004-05-20 23:22:19 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-05-20 23:22:19 -0700
commita5849316e65a88dc3e6e008fcc4d4fc15f087964 (patch)
tree9ebf1be0251900f23899cd4d04020b07770a7a36 /Documentation
parentf1474fba2b8b9b208cc277eab1f1958384928ac3 (diff)
downloadhistory-a5849316e65a88dc3e6e008fcc4d4fc15f087964.tar.gz
[PATCH] trivial: fix /proc documentation lies about file-nr
From: Rusty Russell <rusty@rustcorp.com.au> From: Tommi Virtanen <tv@tv.debian.net>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/filesystems/proc.txt16
1 files changed, 10 insertions, 6 deletions
diff --git a/Documentation/filesystems/proc.txt b/Documentation/filesystems/proc.txt
index 013d8c79da7040..bc552015b66b04 100644
--- a/Documentation/filesystems/proc.txt
+++ b/Documentation/filesystems/proc.txt
@@ -852,7 +852,8 @@ this time.
The value in file-max denotes the maximum number of file handles that the
Linux kernel will allocate. When you get a lot of error messages about running
out of file handles, you might want to raise this limit. The default value is
-4096. To change it, just write the new number into the file:
+10% of RAM in kilobytes. To change it, just write the new number into the
+file:
# cat /proc/sys/fs/file-max
4096
@@ -864,11 +865,14 @@ out of file handles, you might want to raise this limit. The default value is
This method of revision is useful for all customizable parameters of the
kernel - simply echo the new value to the corresponding file.
-The three values in file-nr denote the number of allocated file handles, the
-number of used file handles, and the maximum number of file handles. When the
-allocated file handles come close to the maximum, but the number of actually
-used ones is far behind, you've encountered a peak in your usage of file
-handles and you don't need to increase the maximum.
+Historically, the three values in file-nr denoted the number of allocated file
+handles, the number of allocated but unused file handles, and the maximum
+number of file handles. Linux 2.6 always reports 0 as the number of free file
+handles -- this is not an error, it just means that the number of allocated
+file handles exactly matches the number of used file handles.
+
+Attempts to allocate more file descriptors than file-max are reported with
+printk, look for "VFS: file-max limit <number> reached".
inode-state and inode-nr
------------------------