All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Documentation: Fix 'file_mapped' -> 'mapped_file'
@ 2018-01-30 16:42 Florian Schmidt
  2018-01-30 17:12 ` Michal Hocko
       [not found] ` <20180130164213.20387-1-florian.schmidt-kcmmt4fgdiuHXe+LvDLADg@public.gmane.org>
  0 siblings, 2 replies; 3+ messages in thread
From: Florian Schmidt @ 2018-01-30 16:42 UTC (permalink / raw)
  To: Tejun Heo, Li Zefan, Johannes Weiner, Jonathan Corbet
  Cc: cgroups-u79uwXL29TY76Z2rM5mHXA, linux-doc-u79uwXL29TY76Z2rM5mHXA,
	Florian Schmidt

There is no entry file_mapped in the memory.stat file. This looks like a
simple word flip that's gone unnoticed since 2010 (dc10e281f5fc,
memcg: update documentation).

Signed-off-by: Florian Schmidt <florian.schmidt-kcmmt4fgdiuHXe+LvDLADg@public.gmane.org>
---
 Documentation/cgroup-v1/memory.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/cgroup-v1/memory.txt b/Documentation/cgroup-v1/memory.txt
index cefb63639070..a4af2e124e24 100644
--- a/Documentation/cgroup-v1/memory.txt
+++ b/Documentation/cgroup-v1/memory.txt
@@ -524,9 +524,9 @@ Note:
 	Only anonymous and swap cache memory is listed as part of 'rss' stat.
 	This should not be confused with the true 'resident set size' or the
 	amount of physical memory used by the cgroup.
-	'rss + file_mapped" will give you resident set size of cgroup.
+	'rss + mapped_file" will give you resident set size of cgroup.
 	(Note: file and shmem may be shared among other cgroups. In that case,
-	 file_mapped is accounted only when the memory cgroup is owner of page
+	 mapped_file is accounted only when the memory cgroup is owner of page
 	 cache.)
 
 5.3 swappiness
-- 
2.16.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] Documentation: Fix 'file_mapped' -> 'mapped_file'
  2018-01-30 16:42 [PATCH] Documentation: Fix 'file_mapped' -> 'mapped_file' Florian Schmidt
@ 2018-01-30 17:12 ` Michal Hocko
       [not found] ` <20180130164213.20387-1-florian.schmidt-kcmmt4fgdiuHXe+LvDLADg@public.gmane.org>
  1 sibling, 0 replies; 3+ messages in thread
From: Michal Hocko @ 2018-01-30 17:12 UTC (permalink / raw)
  To: Florian Schmidt
  Cc: Tejun Heo, Li Zefan, Johannes Weiner, Jonathan Corbet, cgroups,
	linux-doc

On Tue 30-01-18 17:42:13, Florian Schmidt wrote:
> There is no entry file_mapped in the memory.stat file. This looks like a
> simple word flip that's gone unnoticed since 2010 (dc10e281f5fc,
> memcg: update documentation).
> 
> Signed-off-by: Florian Schmidt <florian.schmidt@neclab.eu>

Acked-by: Michal Hocko <mhocko@suse.com>

Thanks for catching this.

> ---
>  Documentation/cgroup-v1/memory.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/cgroup-v1/memory.txt b/Documentation/cgroup-v1/memory.txt
> index cefb63639070..a4af2e124e24 100644
> --- a/Documentation/cgroup-v1/memory.txt
> +++ b/Documentation/cgroup-v1/memory.txt
> @@ -524,9 +524,9 @@ Note:
>  	Only anonymous and swap cache memory is listed as part of 'rss' stat.
>  	This should not be confused with the true 'resident set size' or the
>  	amount of physical memory used by the cgroup.
> -	'rss + file_mapped" will give you resident set size of cgroup.
> +	'rss + mapped_file" will give you resident set size of cgroup.
>  	(Note: file and shmem may be shared among other cgroups. In that case,
> -	 file_mapped is accounted only when the memory cgroup is owner of page
> +	 mapped_file is accounted only when the memory cgroup is owner of page
>  	 cache.)
>  
>  5.3 swappiness
> -- 
> 2.16.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe cgroups" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Michal Hocko
SUSE Labs

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] Documentation: Fix 'file_mapped' -> 'mapped_file'
       [not found] ` <20180130164213.20387-1-florian.schmidt-kcmmt4fgdiuHXe+LvDLADg@public.gmane.org>
@ 2018-01-30 17:53   ` Tejun Heo
  0 siblings, 0 replies; 3+ messages in thread
From: Tejun Heo @ 2018-01-30 17:53 UTC (permalink / raw)
  To: Florian Schmidt
  Cc: Li Zefan, Johannes Weiner, Jonathan Corbet,
	cgroups-u79uwXL29TY76Z2rM5mHXA, linux-doc-u79uwXL29TY76Z2rM5mHXA

On Tue, Jan 30, 2018 at 05:42:13PM +0100, Florian Schmidt wrote:
> There is no entry file_mapped in the memory.stat file. This looks like a
> simple word flip that's gone unnoticed since 2010 (dc10e281f5fc,
> memcg: update documentation).
> 
> Signed-off-by: Florian Schmidt <florian.schmidt-kcmmt4fgdiuHXe+LvDLADg@public.gmane.org>

Applied to cgroup/for-4.16.

Thanks.

-- 
tejun

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-01-30 17:53 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-30 16:42 [PATCH] Documentation: Fix 'file_mapped' -> 'mapped_file' Florian Schmidt
2018-01-30 17:12 ` Michal Hocko
     [not found] ` <20180130164213.20387-1-florian.schmidt-kcmmt4fgdiuHXe+LvDLADg@public.gmane.org>
2018-01-30 17:53   ` Tejun Heo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.