Commit 3f500069 authored by zijun_hu's avatar zijun_hu Committed by Linus Torvalds

mm/vmalloc.c: simplify /proc/vmallocinfo implementation

Many seq_file helpers exist for simplifying implementation of virtual
files especially, for /proc nodes.  however, the helpers for iteration
over list_head are available but aren't adopted to implement
/proc/vmallocinfo currently.

Simplify /proc/vmallocinfo implementation by using existing seq_file
helpers.

Link: http://lkml.kernel.org/r/57FDF2E5.1000201@zoho.comSigned-off-by: default avatarzijun_hu <zijun_hu@htc.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 29fac03b
...@@ -2574,32 +2574,13 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms) ...@@ -2574,32 +2574,13 @@ void pcpu_free_vm_areas(struct vm_struct **vms, int nr_vms)
static void *s_start(struct seq_file *m, loff_t *pos) static void *s_start(struct seq_file *m, loff_t *pos)
__acquires(&vmap_area_lock) __acquires(&vmap_area_lock)
{ {
loff_t n = *pos;
struct vmap_area *va;
spin_lock(&vmap_area_lock); spin_lock(&vmap_area_lock);
va = list_first_entry(&vmap_area_list, typeof(*va), list); return seq_list_start(&vmap_area_list, *pos);
while (n > 0 && &va->list != &vmap_area_list) {
n--;
va = list_next_entry(va, list);
}
if (!n && &va->list != &vmap_area_list)
return va;
return NULL;
} }
static void *s_next(struct seq_file *m, void *p, loff_t *pos) static void *s_next(struct seq_file *m, void *p, loff_t *pos)
{ {
struct vmap_area *va = p, *next; return seq_list_next(p, &vmap_area_list, pos);
++*pos;
next = list_next_entry(va, list);
if (&next->list != &vmap_area_list)
return next;
return NULL;
} }
static void s_stop(struct seq_file *m, void *p) static void s_stop(struct seq_file *m, void *p)
...@@ -2634,9 +2615,11 @@ static void show_numa_info(struct seq_file *m, struct vm_struct *v) ...@@ -2634,9 +2615,11 @@ static void show_numa_info(struct seq_file *m, struct vm_struct *v)
static int s_show(struct seq_file *m, void *p) static int s_show(struct seq_file *m, void *p)
{ {
struct vmap_area *va = p; struct vmap_area *va;
struct vm_struct *v; struct vm_struct *v;
va = list_entry(p, struct vmap_area, list);
/* /*
* s_show can encounter race with remove_vm_area, !VM_VM_AREA on * s_show can encounter race with remove_vm_area, !VM_VM_AREA on
* behalf of vmap area is being tear down or vm_map_ram allocation. * behalf of vmap area is being tear down or vm_map_ram allocation.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment