1 files changed, 10 insertions, 7 deletions
diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index 1458448436cc..62682500878a 100644
--- a/Documentation/sysctl/fs.txt
+++ b/Documentation/sysctl/fs.txt
@@ -96,13 +96,16 @@ handles that the Linux kernel will allocate. When you get lots
 of error messages about running out of file handles, you might
 want to increase this limit.
-The three values in file-nr denote the number of allocated
+Historically, the three values in file-nr denoted the number of
-file handles, the number of unused file handles and the maximum
+allocated file handles, the number of allocated but unused file
-number of file handles. When the allocated file handles come
+handles, and the maximum number of file handles. Linux 2.6 always
-close to the maximum, but the number of unused file handles is
+reports 0 as the number of free file handles -- this is not an
-significantly greater than 0, you've encountered a peak in your 
+error, it just means that the number of allocated file handles
-usage of file handles and you don't need to increase the maximum.
+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".
 ==============================================================
 nr_open:

diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt index 1458448436cc..62682500878a 100644 --- a/Documentation/sysctl/fs.txt +++ b/Documentation/sysctl/fs.txt
@@ -96,13 +96,16 @@ handles that the Linux kernel will allocate. When you get lots
96	of error messages about running out of file handles, you might	96	of error messages about running out of file handles, you might
97	want to increase this limit.	97	want to increase this limit.
98		98
99	The three values in file-nr denote the number of allocated	99	Historically, the three values in file-nr denoted the number of
100	file handles, the number of unused file handles and the maximum	100	allocated file handles, the number of allocated but unused file
101	number of file handles. When the allocated file handles come	101	handles, and the maximum number of file handles. Linux 2.6 always
102	close to the maximum, but the number of unused file handles is	102	reports 0 as the number of free file handles -- this is not an
103	significantly greater than 0, you've encountered a peak in your	103	error, it just means that the number of allocated file handles
104	usage of file handles and you don't need to increase the maximum.	104	exactly matches the number of used file handles.
105		105
		106	Attempts to allocate more file descriptors than file-max are
		107	reported with printk, look for "VFS: file-max limit <number>
		108	reached".
106	==============================================================	109	==============================================================
107		110
108	nr_open:	111	nr_open: