The patch titled Documentation: update stale definition of file-nr in fs.txt has been added to the -mm tree. Its filename is documentation-update-stale-definition-of-file-nr-in-fstxt.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: Documentation: update stale definition of file-nr in fs.txt From: Xiaotian Feng <dfeng@xxxxxxxxxx> 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<dfeng@xxxxxxxxxx> Cc: Randy Dunlap <randy.dunlap@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- Documentation/sysctl/fs.txt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff -puN Documentation/sysctl/fs.txt~documentation-update-stale-definition-of-file-nr-in-fstxt Documentation/sysctl/fs.txt --- a/Documentation/sysctl/fs.txt~documentation-update-stale-definition-of-file-nr-in-fstxt +++ a/Documentation/sysctl/fs.txt @@ -96,13 +96,16 @@ handles that the Linux kernel will alloc 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: _ Patches currently in -mm which might be from dfeng@xxxxxxxxxx are linux-next.patch drm-radeon-kms-fix-memory-leak-in-radeon_driver_load_kms.patch documentation-update-stale-definition-of-file-nr-in-fstxt.patch cgroups-make-unlock-sequence-in-cgroup_get_sb-consistent.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html