mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-01 14:55:39 +00:00
Code Issues Releases Wiki Activity

mount: Rename proc_mountinfo mnt_root to mountpoint

Browse Source 
What is stored there is the path to mountpoint. The root
is the field previously named "parent root".

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2012-05-12 03:40:08 +04:00
parent db297a0f97
commit 79da538469
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/proc_parse.h
View File

@@ -89,7 +89,7 @@ struct proc_mountinfo {
int mnt_id; int mnt_id;
int parent_mnt_id; int parent_mnt_id;
unsigned int s_dev; unsigned int s_dev;
char mnt_root[64]; char mountpoint[64];
}; };
extern int parse_mountinfo(pid_t pid, struct proc_mountinfo *mi, int nr_elems); extern int parse_mountinfo(pid_t pid, struct proc_mountinfo *mi, int nr_elems);

2
mount.c
View File

@@ -26,7 +26,7 @@ again:
for (i = last; i < nr_mntinfo; i++) { for (i = last; i < nr_mntinfo; i++) {
if (s_dev == mntinfo[i].s_dev) { if (s_dev == mntinfo[i].s_dev) {
last = i; last = i;
return open(mntinfo[i].mnt_root, O_RDONLY); return open(mntinfo[i].mountpoint, O_RDONLY);
} }
} }

6
proc_parse.c
View File

@@ -485,7 +485,7 @@ int parse_mountinfo(pid_t pid, struct proc_mountinfo *mi, int nr_elems)
while (fgets(str, sizeof(str), f)) { while (fgets(str, sizeof(str), f)) {
unsigned int kmaj, kmin, parent_mnt_id; unsigned int kmaj, kmin, parent_mnt_id;
char parent_mnt_root[63]; char mnt_root[63];
int ret; int ret;
if ((i + 1) >= nr_elems) { if ((i + 1) >= nr_elems) {
@@ -495,8 +495,8 @@ int parse_mountinfo(pid_t pid, struct proc_mountinfo *mi, int nr_elems)
ret = sscanf(str, "%i %i %u:%u %63s %63s", ret = sscanf(str, "%i %i %u:%u %63s %63s",
&mi[i].mnt_id, &parent_mnt_id, &mi[i].mnt_id, &parent_mnt_id,
&kmaj, &kmin, parent_mnt_root, &kmaj, &kmin, mnt_root,
mi[i].mnt_root); mi[i].mountpoint);
if (ret != 6) { if (ret != 6) {
pr_err("Bad format in %d mountinfo\n", pid); pr_err("Bad format in %d mountinfo\n", pid);
i = -1; i = -1;