mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

proc: Print parsed fstype for unsupported mounts

Browse Source 
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2015-01-23 17:50:00 +03:00
parent d1d4c018e0
commit 89d9578730
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
proc_parse.c
View File

@@ -910,7 +910,7 @@ static int parse_mnt_opt(char *str, struct mount_info *mi, int *off)
return 0;
}
static int parse_mountinfo_ent(char *str, struct mount_info *new)
static int parse_mountinfo_ent(char *str, struct mount_info *new, char **r_fstype)
{
unsigned int kmaj, kmin;
int ret, n;
@@ -951,6 +951,8 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new)
ret = -1;
new->fstype = find_fstype_by_name(fstype);
if (new->fstype->code == FSTYPE__UNSUPPORTED)
*r_fstype = fstype; /* keep for logging */
new->options = xmalloc(strlen(opt) + 1);
if (!new->options)
@@ -962,7 +964,8 @@ static int parse_mountinfo_ent(char *str, struct mount_info *new)
ret = 0;
err:
free(opt);
free(fstype);
if (!*r_fstype)
free(fstype);
return ret;
}
@@ -981,6 +984,7 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid)
while (fgets(str, sizeof(str), f)) {
struct mount_info *new;
int ret;
char *fst = NULL;
new = mnt_entry_alloc();
if (!new)
@@ -991,14 +995,14 @@ struct mount_info *parse_mountinfo(pid_t pid, struct ns_id *nsid)
new->next = list;
list = new;
ret = parse_mountinfo_ent(str, new);
ret = parse_mountinfo_ent(str, new, &fst);
if (ret < 0) {
pr_err("Bad format in %d mountinfo\n", pid);
goto err;
}
pr_info("\ttype %s source %s mnt_id %#x s_dev %#x %s @ %s flags %#x options %s\n",
new->fstype->name, new->source,
fst ? : new->fstype->name, new->source,
new->mnt_id, new->s_dev, new->root, new->mountpoint,
new->flags, new->options);