aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/sysctl
diff options
context:
space:
mode:
authorFederica Teodori <federica.teodori@googlemail.com>2011-03-15 19:12:05 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-16 13:47:03 -0400
commitca3b78aa1672162f93de90cbf5051edea298a290 (patch)
tree90c62c83356d847286050cc8cdeac47afbed983d /Documentation/sysctl
parentaa4862c38b179646cea73adae41e0078ba05bb60 (diff)
Documentation: file handles are now freed
Since file handles are freed, a little amendment to the documentation Signed-off-by: Federica Teodori <federica.teodori@googlemail.com> Acked-by: Rik van Riel<riel@redhat.com> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/sysctl')
-rw-r--r--Documentation/sysctl/fs.txt17
1 files changed, 8 insertions, 9 deletions
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index 62682500878a..4af0614147ef 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -88,20 +88,19 @@ you might want to raise the limit.
88 88
89file-max & file-nr: 89file-max & file-nr:
90 90
91The kernel allocates file handles dynamically, but as yet it
92doesn't free them again.
93
94The value in file-max denotes the maximum number of file- 91The value in file-max denotes the maximum number of file-
95handles that the Linux kernel will allocate. When you get lots 92handles that the Linux kernel will allocate. When you get lots
96of error messages about running out of file handles, you might 93of error messages about running out of file handles, you might
97want to increase this limit. 94want to increase this limit.
98 95
99Historically, the three values in file-nr denoted the number of 96Historically,the kernel was able to allocate file handles
100allocated file handles, the number of allocated but unused file 97dynamically, but not to free them again. The three values in
101handles, and the maximum number of file handles. Linux 2.6 always 98file-nr denote the number of allocated file handles, the number
102reports 0 as the number of free file handles -- this is not an 99of allocated but unused file handles, and the maximum number of
103error, it just means that the number of allocated file handles 100file handles. Linux 2.6 always reports 0 as the number of free
104exactly matches the number of used file handles. 101file handles -- this is not an error, it just means that the
102number of allocated file handles exactly matches the number of
103used file handles.
105 104
106Attempts to allocate more file descriptors than file-max are 105Attempts to allocate more file descriptors than file-max are
107reported with printk, look for "VFS: file-max limit <number> 106reported with printk, look for "VFS: file-max limit <number>