diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-31 14:50:22 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-31 14:50:22 +0100 |
| commit | d1cdf78574f3269350a103a353db1e2cf37cfb12 (patch) | |
| tree | 21608034dc93663ff3bc0686b2685e90c9e4005c /Documentation/filesystems | |
| parent | a3272880cbaf76f20b7364c278b0870fd1d8816f (diff) | |
| parent | d699a5da103942fdc0a8a5383359bdec01fc19dd (diff) | |
| download | linux-next-d1cdf78574f3269350a103a353db1e2cf37cfb12.tar.gz linux-next-d1cdf78574f3269350a103a353db1e2cf37cfb12.zip | |
Merge branch 'docs-next' of git://git.lwn.net/linux.git
Diffstat (limited to 'Documentation/filesystems')
| -rw-r--r-- | Documentation/filesystems/overlayfs.rst | 3 | ||||
| -rw-r--r-- | Documentation/filesystems/proc.rst | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Documentation/filesystems/overlayfs.rst b/Documentation/filesystems/overlayfs.rst index 1a29a5afabd7..16c35b491dad 100644 --- a/Documentation/filesystems/overlayfs.rst +++ b/Documentation/filesystems/overlayfs.rst @@ -123,8 +123,7 @@ At mount time, the two directories given as mount options "lowerdir" and mount -t overlay overlay -olowerdir=/lower,upperdir=/upper,\ workdir=/work /merged -The "workdir" needs to be an empty directory on the same filesystem -as upperdir. +The "workdir" needs to be a directory on the same filesystem as upperdir. Then whenever a lookup is requested in such a merged directory, the lookup is performed in each actual directory and the combined result diff --git a/Documentation/filesystems/proc.rst b/Documentation/filesystems/proc.rst index 27189f6e004e..c102b62023cd 100644 --- a/Documentation/filesystems/proc.rst +++ b/Documentation/filesystems/proc.rst @@ -513,7 +513,7 @@ In some kernel configurations, the semantics of pages part of a larger allocation (e.g., THP) can differ: a page is accounted as "private" if all pages part of the corresponding large allocation are *certainly* mapped in the same process, even if the page is mapped multiple times in that process. A -page is accounted as "shared" if any page page of the larger allocation +page is accounted as "shared" if any page of the larger allocation is *maybe* mapped in a different process. In some cases, a large allocation might be treated as "maybe mapped by multiple processes" even though this is no longer the case. |