mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-03 07:45:17 +00:00
Code Issues Releases Wiki Activity

files-reg: Strip off "(deleted)" postfix on ghost files

Browse Source 
Otherwise this postfix will be accumulated on
subsequent checkpoints.

Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
Acked-by: Tycho Andersen <tycho.andersen@canonical.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Cyrill Gorcunov
2014-10-16 14:27:25 +04:00
committed by Pavel Emelyanov
parent a944a78ce9
commit 4b9406eae2
1 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
files-reg.c
View File

@@ -623,9 +623,27 @@ static inline bool nfs_silly_rename(char *rpath, const struct fd_parms *parms)
return (parms->fs_type == NFS_SUPER_MAGIC) && is_sillyrename_name(rpath); return (parms->fs_type == NFS_SUPER_MAGIC) && is_sillyrename_name(rpath);
} }
static int check_path_remap(char *rpath, int plen, const struct fd_parms *parms, static void strip_deleted(struct fd_link *link)
{
const char postfix[] = " (deleted)";
const size_t plen = strlen(postfix);
if (link->len > plen) {
size_t at = link->len - plen;
if (!strcmp(&link->name[at], postfix)) {
pr_debug("Stip %s' tag from '%s'\n",
postfix, link->name);
link->name[at] = '\0';
link->len -= plen;
}
}
}
static int check_path_remap(struct fd_link *link, const struct fd_parms *parms,
int lfd, u32 id, struct ns_id *nsid) int lfd, u32 id, struct ns_id *nsid)
{ {
char *rpath = link->name;
int plen = link->len;
int ret, mntns_root; int ret, mntns_root;
struct stat pst; struct stat pst;
const struct stat *ost = &parms->stat; const struct stat *ost = &parms->stat;
@@ -664,14 +682,16 @@ static int check_path_remap(char *rpath, int plen, const struct fd_parms *parms,
return 0; return 0;
} }
if (ost->st_nlink == 0) if (ost->st_nlink == 0) {
/* /*
* Unpleasant, but easy case. File is completely invisible * Unpleasant, but easy case. File is completely invisible
* from the FS. Just dump its contents and that's it. But * from the FS. Just dump its contents and that's it. But
* be careful whether anybody still has any of its hardlinks * be careful whether anybody still has any of its hardlinks
* also open. * also open.
*/ */
strip_deleted(link);
return dump_ghost_remap(rpath + 1, ost, lfd, id, nsid); return dump_ghost_remap(rpath + 1, ost, lfd, id, nsid);
}
if (nfs_silly_rename(rpath, parms)) { if (nfs_silly_rename(rpath, parms)) {
/* /*
@@ -771,7 +791,7 @@ int dump_one_reg_file(int lfd, u32 id, const struct fd_parms *p)
return -1; return -1;
} }
if (check_path_remap(link->name, link->len, p, lfd, id, nsid)) if (check_path_remap(link, p, lfd, id, nsid))
return -1; return -1;
rfe.id = id; rfe.id = id;