Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-22 09:39:13 +00:00
Code Issues Projects Releases Wiki Activity

remap: add remap_type field and use it

Browse source 
Maintain backwards compatibility for old images, but don't set the REMAP_GHOST
bit going forward, only use the remap_type field.

v2: * preserve remap_id in GHOST_REMAP case
    * protobuf field is remap_type enum not u32

Signed-off-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Tycho Andersen 2014-09-18 00:32:00 +04:00 • committed by Pavel Emelyanov
parent 2dcafd1419
commit 6b70e4ad81
2 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
files-reg.c
View file

@ -131,7 +131,6 @@ static int open_remap_ghost(struct reg_file_info *rfi,
int ifd;
char *root;
rfe->remap_id &= ~REMAP_GHOST;
list_for_each_entry(gf, &ghost_files, list)
if (gf->id == rfe->remap_id)
goto gf_found;
@ -246,10 +245,29 @@ static int collect_one_remap(void *obj, ProtobufCMessage *msg)
rfi = container_of(fdesc, struct reg_file_info, d);
pr_info("Configuring remap %#x -> %#x\n", rfi->rfe->id, rfe->remap_id);
if (rfe->remap_id & REMAP_GHOST)
ret = open_remap_ghost(rfi, rfe);
else
if (!rfe->has_remap_type) {
rfe->has_remap_type = true;
/* backward compatibility with images */
if (rfe->remap_id & REMAP_GHOST) {
rfe->remap_id &= ~REMAP_GHOST;
rfe->remap_type = REMAP_TYPE__GHOST;
} else
rfe->remap_type = REMAP_TYPE__LINKED;
}
switch (rfe->remap_type) {
case REMAP_TYPE__LINKED:
ret = open_remap_linked(rfi, rfe);
break;
case REMAP_TYPE__GHOST:
ret = open_remap_ghost(rfi, rfe);
break;
default:
pr_err("unknown remap type %u\n", rfe->remap_type);
goto out;
}
out:
return ret;
}
@ -375,10 +393,10 @@ static int dump_ghost_remap(char *path, const struct stat *st,
return -1;
dump_entry:
BUG_ON(gf->id & REMAP_GHOST);
rpe.orig_id = id;
rpe.remap_id = gf->id | REMAP_GHOST;
rpe.remap_id = gf->id;
rpe.has_remap_type = true;
rpe.remap_type = REMAP_TYPE__GHOST;
return pb_write_one(fdset_fd(glob_fdset, CR_FD_REMAP_FPATH),
&rpe, PB_REMAP_FPATH);

6
protobuf/remap-file-path.proto
View file

@ -1,4 +1,10 @@
enum remap_type {
LINKED = 0;
GHOST = 1;
};
message remap_file_path_entry {
required uint32 orig_id = 1;
required uint32 remap_id = 2;
optional remap_type remap_type = 3;
}