[PATCHv8 18/34] fs/proc: Respect boottime inside time namespace for /proc/uptime
flat view
STALE2438d
LANDED
From: Dmitry Safonov <hidden>
Date: 2019-11-12 01:29:20
Also in:
lkml
Subsystem:
filesystems (vfs and infrastructure), proc filesystem, the rest · Maintainers:
Alexander Viro, Christian Brauner, Linus Torvalds
Revision v8 of 7 in this series; landed in mainline as 0efc8bb0bb5f on 2020-01-14.
Revisions (7)
Co-developed-by: Andrei Vagin <redacted> Signed-off-by: Andrei Vagin <redacted> Signed-off-by: Dmitry Safonov <redacted> --- fs/proc/uptime.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index a4c2791ab70b..5a1b228964fb 100644
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c@@ -5,6 +5,7 @@ #include <linux/sched.h> #include <linux/seq_file.h> #include <linux/time.h> +#include <linux/time_namespace.h> #include <linux/kernel_stat.h> static int uptime_proc_show(struct seq_file *m, void *v)
@@ -20,6 +21,8 @@ static int uptime_proc_show(struct seq_file *m, void *v) nsec += (__force u64) kcpustat_cpu(i).cpustat[CPUTIME_IDLE]; ktime_get_boottime_ts64(&uptime); + timens_add_boottime(&uptime); + idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem); idle.tv_nsec = rem; seq_printf(m, "%lu.%02lu %lu.%02lu\n",
--
2.24.0