2022-07-12 17:54:40

by Stephen Kitt

[permalink] [raw]
Subject: [PATCH 1/5] docs: sysctl: remove references to inode-max

inode-max was removed in 2.3.20pre1, remove references to it in the
sysctl documentation.

Signed-off-by: Stephen Kitt <[email protected]>
---
Documentation/admin-guide/sysctl/fs.rst | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst
index 2a501c9ddc55..54130ae33df8 100644
--- a/Documentation/admin-guide/sysctl/fs.rst
+++ b/Documentation/admin-guide/sysctl/fs.rst
@@ -33,7 +33,6 @@ Currently, these files are in /proc/sys/fs:
- dquot-nr
- file-max
- file-nr
-- inode-max
- inode-nr
- inode-state
- nr_open
@@ -136,18 +135,12 @@ enough for most machines. Actual limit depends on RLIMIT_NOFILE
resource limit.


-inode-max, inode-nr & inode-state
----------------------------------
+inode-nr & inode-state
+----------------------

As with file handles, the kernel allocates the inode structures
dynamically, but can't free them yet.

-The value in inode-max denotes the maximum number of inode
-handlers. This value should be 3-4 times larger than the value
-in file-max, since stdin, stdout and network sockets also
-need an inode struct to handle them. When you regularly run
-out of inodes, you need to increase this value.
-
The file inode-nr contains the first two items from
inode-state, so we'll skip to that file...

@@ -156,11 +149,10 @@ The actual numbers are, in order of appearance, nr_inodes,
nr_free_inodes and preshrink.

Nr_inodes stands for the number of inodes the system has
-allocated, this can be slightly more than inode-max because
-Linux allocates them one pageful at a time.
+allocated.

Nr_free_inodes represents the number of free inodes (?) and
-preshrink is nonzero when the nr_inodes > inode-max and the
+preshrink is nonzero when the
system needs to prune the inode list instead of allocating
more.


base-commit: 50fd82b3a9a9335df5d50c7ddcb81c81d358c4fc
--
2.31.1


2022-07-12 18:02:43

by Stephen Kitt

[permalink] [raw]
Subject: [PATCH 3/5] docs: sysctl/fs: merge the aio sections

There are two sections documenting aio-nr and aio-max-nr, merge them.
I kept the second explanation of aio-nr, which seems clearer to me,
along with the effects of the values from the first section.

Signed-off-by: Stephen Kitt <[email protected]>
---
Documentation/admin-guide/sysctl/fs.rst | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst
index 0935acd220dc..a61c6aec5e5e 100644
--- a/Documentation/admin-guide/sysctl/fs.rst
+++ b/Documentation/admin-guide/sysctl/fs.rst
@@ -50,11 +50,11 @@ Currently, these files are in /proc/sys/fs:
aio-nr & aio-max-nr
-------------------

-aio-nr is the running total of the number of events specified on the
-io_setup system call for all currently active aio contexts. If aio-nr
-reaches aio-max-nr then io_setup will fail with EAGAIN. Note that
-raising aio-max-nr does not result in the pre-allocation or re-sizing
-of any kernel data structures.
+aio-nr shows the current system-wide number of asynchronous io
+requests. aio-max-nr allows you to change the maximum value
+aio-nr can grow to. If aio-nr reaches aio-nr-max then io_setup will
+fail with EAGAIN. Note that raising aio-max-nr does not result in the
+pre-allocation or re-sizing of any kernel data structures.


dentry-state
@@ -287,14 +287,6 @@ mount more filesystems than the current value in super-max
allows you to.


-aio-nr & aio-max-nr
--------------------
-
-aio-nr shows the current system-wide number of asynchronous io
-requests. aio-max-nr allows you to change the maximum value
-aio-nr can grow to.
-
-
mount-max
---------

--
2.31.1

2022-07-12 18:16:14

by Stephen Kitt

[permalink] [raw]
Subject: [PATCH 4/5] docs: sysctl/fs: remove references to super-max/-nr

These were removed in 2.4.7.8. Remove references to super-max and
super-nr in the sysctl documentation.

Signed-off-by: Stephen Kitt <[email protected]>
---
Documentation/admin-guide/sysctl/fs.rst | 10 ----------
1 file changed, 10 deletions(-)

diff --git a/Documentation/admin-guide/sysctl/fs.rst b/Documentation/admin-guide/sysctl/fs.rst
index a61c6aec5e5e..df683c15b098 100644
--- a/Documentation/admin-guide/sysctl/fs.rst
+++ b/Documentation/admin-guide/sysctl/fs.rst
@@ -277,16 +277,6 @@ or otherwise protected/tainted binaries. The modes are
= ========== ===============================================================


-super-max & super-nr
---------------------
-
-These numbers control the maximum number of superblocks, and
-thus the maximum number of mounted filesystems the kernel
-can have. You only need to increase super-max if you need to
-mount more filesystems than the current value in super-max
-allows you to.
-
-
mount-max
---------

--
2.31.1

2022-07-13 20:12:41

by Jonathan Corbet

[permalink] [raw]
Subject: Re: [PATCH 1/5] docs: sysctl: remove references to inode-max

Stephen Kitt <[email protected]> writes:

> inode-max was removed in 2.3.20pre1, remove references to it in the
> sysctl documentation.
>
> Signed-off-by: Stephen Kitt <[email protected]>

These patches look good to me, but I'd feel better if you would post the
set, with a proper cover letter, to linux-fsdevel to get the attention
of folks who know this stuff a bit better.

Thanks,

jon