microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fs, proc: remove priv argument from is_stack 

Commit b18cb64ead ("fs/proc: Stop trying to report thread stacks")
removed the priv parameter user in is_stack so the argument is
redundant.  Drop it.

[arnd@arndb.de: remove unused variable]
  Link: http://lkml.kernel.org/r/20170801120150.1520051-1-arnd@arndb.de
Link: http://lkml.kernel.org/r/20170728075833.7241-1-mhocko@kernel.org
Signed-off-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Michal Hocko 2017-09-08 16:13:35 -07:00 коммит произвёл Linus Torvalds
Родитель 149728e913
Коммит 1240ea0dc3
2 изменённых файлов: 5 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
fs/proc/task_mmu.c
Просмотреть файл

@ -268,8 +268,7 @@ static int do_maps_open(struct inode *inode, struct file *file,
* Indicate if the VMA is a stack for the given task; for * Indicate if the VMA is a stack for the given task; for
* /proc/PID/maps that is the stack of the main task. * /proc/PID/maps that is the stack of the main task.
*/ */
static int is_stack(struct proc_maps_private *priv, static int is_stack(struct vm_area_struct *vma)
struct vm_area_struct *vma)
{ {
/* /*
* We make no effort to guess what a given thread considers to be * We make no effort to guess what a given thread considers to be
@ -302,7 +301,6 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
{ {
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
struct file *file = vma->vm_file; struct file *file = vma->vm_file;
struct proc_maps_private *priv = m->private;
vm_flags_t flags = vma->vm_flags; vm_flags_t flags = vma->vm_flags;
unsigned long ino = 0; unsigned long ino = 0;
unsigned long long pgoff = 0; unsigned long long pgoff = 0;
@ -350,7 +348,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
goto done; goto done;
} }
if (is_stack(priv, vma)) if (is_stack(vma))
name = "[stack]"; name = "[stack]";
} }
@ -1768,7 +1766,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
seq_file_path(m, file, "\n\t= "); seq_file_path(m, file, "\n\t= ");
} else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
seq_puts(m, " heap"); seq_puts(m, " heap");
} else if (is_stack(proc_priv, vma)) { } else if (is_stack(vma)) {
seq_puts(m, " stack"); seq_puts(m, " stack");
} }

5
fs/proc/task_nommu.c
Просмотреть файл

@ -125,8 +125,7 @@ unsigned long task_statm(struct mm_struct *mm,
return size; return size;
} }
static int is_stack(struct proc_maps_private *priv, static int is_stack(struct vm_area_struct *vma)
struct vm_area_struct *vma)
{ {
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
@ -178,7 +177,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
if (file) { if (file) {
seq_pad(m, ' '); seq_pad(m, ' ');
seq_file_path(m, file, ""); seq_file_path(m, file, "");
} else if (mm && is_stack(priv, vma)) { } else if (mm && is_stack(vma)) {
seq_pad(m, ' '); seq_pad(m, ' ');
seq_printf(m, "[stack]"); seq_printf(m, "[stack]");
} }