Commit 6a6cdb8d authored by Pavel Emelyanov's avatar Pavel Emelyanov

proc: Drop always true last argument of parse_smaps()

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
parent 5e99d708
...@@ -150,7 +150,7 @@ int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list) ...@@ -150,7 +150,7 @@ int collect_mappings(pid_t pid, struct vm_area_list *vma_area_list)
pr_info("Collecting mappings (pid: %d)\n", pid); pr_info("Collecting mappings (pid: %d)\n", pid);
pr_info("----------------------------------------\n"); pr_info("----------------------------------------\n");
ret = parse_smaps(pid, vma_area_list, true); ret = parse_smaps(pid, vma_area_list);
if (ret < 0) if (ret < 0)
goto err; goto err;
......
...@@ -155,7 +155,7 @@ struct vm_area_list; ...@@ -155,7 +155,7 @@ struct vm_area_list;
extern struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid); extern struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid);
extern int parse_pid_stat(pid_t pid, struct proc_pid_stat *s); extern int parse_pid_stat(pid_t pid, struct proc_pid_stat *s);
extern int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, bool use_map_files); extern int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list);
extern int parse_self_maps_lite(struct vm_area_list *vms); extern int parse_self_maps_lite(struct vm_area_list *vms);
extern int parse_pid_status(pid_t pid, struct proc_status_creds *); extern int parse_pid_status(pid_t pid, struct proc_status_creds *);
......
...@@ -196,9 +196,6 @@ static int vma_get_mapfile(struct vma_area *vma, DIR *mfd, ...@@ -196,9 +196,6 @@ static int vma_get_mapfile(struct vma_area *vma, DIR *mfd,
{ {
char path[32]; char path[32];
if (!mfd)
return 0;
if (prev_vfi->vma && vfi_equal(vfi, prev_vfi)) { if (prev_vfi->vma && vfi_equal(vfi, prev_vfi)) {
struct vma_area *prev = prev_vfi->vma; struct vma_area *prev = prev_vfi->vma;
...@@ -292,7 +289,7 @@ int parse_self_maps_lite(struct vm_area_list *vms) ...@@ -292,7 +289,7 @@ int parse_self_maps_lite(struct vm_area_list *vms)
return 0; return 0;
} }
int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, bool use_map_files) int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list)
{ {
struct vma_area *vma_area = NULL; struct vma_area *vma_area = NULL;
unsigned long start, end, pgoff, prev_end = 0; unsigned long start, end, pgoff, prev_end = 0;
...@@ -316,11 +313,9 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, bool use_map_file ...@@ -316,11 +313,9 @@ int parse_smaps(pid_t pid, struct vm_area_list *vma_area_list, bool use_map_file
if (bfdopen(&f, O_RDONLY)) if (bfdopen(&f, O_RDONLY))
goto err_n; goto err_n;
if (use_map_files) {
map_files_dir = opendir_proc(pid, "map_files"); map_files_dir = opendir_proc(pid, "map_files");
if (!map_files_dir) /* old kernel? */ if (!map_files_dir) /* old kernel? */
goto err; goto err;
}
while (1) { while (1) {
int num; int num;
......
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