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

mount: Move binfmt_misc entry restore code to subfunction

Browse Source 
Also rename restore_binfmt_misc_entry() to write_binfmt_misc_entry()

v6: New
Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Kirill Tkhai
2016-08-23 19:16:39 +03:00
committed by Pavel Emelyanov
parent 725e2d00b8
commit cf164e16e8
1 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
criu/mount.c
View File

@@ -1413,7 +1413,7 @@ out:
return ret;
}
static int restore_binfmt_misc_entry(char *mp, char *buf, BinfmtMiscEntry *bme)
static int write_binfmt_misc_entry(char *mp, char *buf, BinfmtMiscEntry *bme)
{
int fd, len, ret = -1;
char path[PATH_MAX+1];
@@ -1493,6 +1493,31 @@ static int make_bfmtm_magic_str(char *buf, BinfmtMiscEntry *bme)
return 1;
}
static int binfmt_misc_restore_bme(struct mount_info *mi, BinfmtMiscEntry *bme, char *buf)
{
int ret;
/* :name:type:offset:magic/extension:mask:interpreter:flags */
if ((!bme->magic && !bme->extension) || !bme->interpreter) {
pr_perror("binfmt_misc: bad dump");
ret = -1;
} else if (bme->magic) {
ret = make_bfmtm_magic_str(buf, bme);
} else if (bme->extension) {
/* :name:E::extension::interpreter:flags */
ret = snprintf(buf, BINFMT_MISC_STR, ":%s:E::%s::%s:%s",
bme->name, bme->extension, bme->interpreter,
bme->flags ? : "\0");
}
if (ret > 0) {
pr_debug("binfmt_misc_pattern=%s\n", buf);
ret = write_binfmt_misc_entry(mi->mountpoint, buf, bme);
}
return ret;
}
static int binfmt_misc_restore(struct mount_info *mi)
{
struct cr_img *img;
@@ -1516,23 +1541,7 @@ static int binfmt_misc_restore(struct mount_info *mi)
if (ret <= 0)
break;
/* :name:type:offset:magic/extension:mask:interpreter:flags */
if ((!bme->magic && !bme->extension) || !bme->interpreter) {
pr_perror("binfmt_misc: bad dump");
ret = -1;
} else if (bme->magic) {
ret = make_bfmtm_magic_str(buf, bme);
} else if (bme->extension) {
/* :name:E::extension::interpreter:flags */
ret = snprintf(buf, BINFMT_MISC_STR, ":%s:E::%s::%s:%s",
bme->name, bme->extension, bme->interpreter,
bme->flags ? : "\0");
}
if (ret > 0) {
pr_debug("binfmt_misc_pattern=%s\n", buf);
ret = restore_binfmt_misc_entry(mi->mountpoint, buf, bme);
}
ret = binfmt_misc_restore_bme(mi, bme, buf);
binfmt_misc_entry__free_unpacked(bme, NULL);
}