Commit fc225709 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by Cyrill Gorcunov

proc: Make parse_maps return the amount of them found

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Signed-off-by: 's avatarCyrill Gorcunov <gorcunov@openvz.org>
parent e94c85fe
......@@ -75,12 +75,13 @@ static int collect_mappings(pid_t pid, struct list_head *vma_area_list)
pr_info("----------------------------------------\n");
ret = parse_maps(pid, vma_area_list, true);
if (ret)
if (ret < 0)
goto err;
pr_info_vma_list(vma_area_list);
pr_info("----------------------------------------\n");
ret = 0;
err:
return ret;
......
......@@ -1661,7 +1661,7 @@ static void sigreturn_restore(pid_t pid)
ret = parse_maps(pid, &self_vma_list, false);
close_pid_proc();
if (ret)
if (ret < 0)
goto err;
/* pr_info_vma_list(&self_vma_list); */
......
......@@ -23,7 +23,7 @@ int parse_maps(pid_t pid, struct list_head *vma_area_list, bool use_map_files)
unsigned long ino;
char r,w,x,s;
int dev_maj, dev_min;
int ret = -1;
int ret = -1, nr = 0;
DIR *map_files_dir = NULL;
FILE *maps = NULL;
......@@ -157,10 +157,11 @@ int parse_maps(pid_t pid, struct list_head *vma_area_list, bool use_map_files)
}
list_add_tail(&vma_area->list, vma_area_list);
nr++;
}
vma_area = NULL;
ret = 0;
ret = nr;
err:
if (maps)
......
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