2009-07-29 10:44:16

by Xiaotian Feng

[permalink] [raw]
Subject: [PATCH] trivial: Fix stale definition of file-nr in documentation

commit 760df9 merged /proc/sys/fs documentation in Documentation/sysctl/
fs.txt and Documentation/filesystem/proc.txt, but stale file-nr definition
is remained. This patch add back the right fs-nr definition for 2.6 kernel.

Signed-off-by: Xiaotian Feng<[email protected]>
---
Documentation/sysctl/fs.txt | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Documentation/sysctl/fs.txt b/Documentation/sysctl/fs.txt
index 1458448..6268250 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
-file handles, the number of unused file handles and the maximum
-number of file handles. When the allocated file handles come
-close to the maximum, but the number of unused file handles is
-significantly greater than 0, 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".
==============================================================

nr_open:
--
1.6.2.5